Commit Graph

4750 Commits

Author SHA1 Message Date
deltanedas
ed2ef10362 clean up glass sheets and make their destruction consistent (#16708)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-08 17:22:11 +10:00
brainfood1183
cd7d4be188 HAMTR mech (hamster mech) (needs review) (#16393)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-06-08 16:33:35 +10:00
TemporalOroboros
d71b6c84e5 Converts the particle accelerator over to ECS + misc (#17075)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-06-08 16:25:59 +10:00
justproggramer
608ddf0ab8 Emotion (#17187) 2023-06-08 16:22:02 +10:00
deltanedas
07d2430840 logic gate stuff (#16943)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-07 16:48:42 -07:00
lzk
9d39403fac Change sprites for some medipens (#17180) 2023-06-07 15:18:17 -07:00
deltanedas
6acfe53e5f add breakers to power batteries (#16903)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-07 12:43:54 -07:00
metalgearsloth
c2fed26bdb Add cargo pallet to cargo products (#17192) 2023-06-07 12:40:30 -07:00
Kit0vras
9adf737854 Reagent "Fat" and reactions for soapification and meatification (#16058)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-06-07 23:04:36 +10:00
lzk
19421340e2 Change DamageVisuals color for slime and diona (#17155) 2023-06-07 18:57:49 +10:00
deltanedas
f5d2b0e284 only show flavor above 0.1u (#17169)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-07 14:29:23 +10:00
Sir Winters
33e48344e8 No more bloodbag mouse. (#17124)
Co-authored-by: Owai-Seek <>
2023-06-06 21:53:40 -06:00
Velcroboy
838668412c Adds Bingus and Space Cat spawners (#17150)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-06-06 21:53:27 -06:00
Stealthbomber16
e6466c4873 Update seeds.yml (#17174) 2023-06-06 21:48:08 -06:00
HerCoyote23
092a130e8d Seclite does 10 blunt (#17139)
* Seclite does 10 blunt

* Empty Commit?
2023-06-06 15:21:18 -06:00
Velcroboy
e02cfa6956 Make mop buckets/trolleys spillable again. (#17148)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-06-05 17:45:58 -07:00
Sir Winters
f1833ea9eb GuideHelp Tags for Medical + Chef (#17138)
* GuideHelp Tags Medical + Chef

* Empty-Commit

---------

Co-authored-by: Owai-Seek <>
2023-06-05 17:47:14 -05:00
Sir Winters
a1b0f10e5c Chem/Medicine/Botanical Book Entries (#17145)
Co-authored-by: Owai-Seek <>
2023-06-05 17:45:45 -05:00
Nemanja
85c2c5091e Bartender guide (#17143)
* Bartender guidebook

* grammar error :Death:
2023-06-05 17:44:43 -05:00
Nemanja
3129f950fc Give categories to some reagents (#17142) 2023-06-05 17:08:30 -04:00
DEATHB4DEFEAT
a8337172ca More gendered sprite masks (#14735) 2023-06-05 21:11:45 +10:00
Ubaser
35ebcc66df Transit: NEW Evacuation shuttle (#17095)
* add shuttle

* fix mistakes, improve consistency

- adds tiny fans to airlock
- changes LED to lights
- adds supplies to med
- engineering door changed to not be glass
- added tile beneath engi and medbay door
- changed security cell
- added SMES to power
- added variety (variantize)
- saved as grid instead of map

* apply changes

- replaced plastic tiles with steel
- removed fireaxe in bridge
- rotated defib the correct way
- switched a couple LED lights out
- replaced potted plants and vending machines with their appropriate spawner
- adds more chairs

* fix defib

changed from empty to filled

---------

Co-authored-by: Ubaser <ubaserblueknight2@gmail.com>
2023-06-04 20:52:57 -06:00
lzk
181ab585de comit (#17037) 2023-06-04 18:55:30 -06:00
Puro
d96f3e6530 [SG] IHS remove (#17081) 2023-06-04 18:54:12 -06:00
HerCoyote23
fff6a7640c Spears and Bats are big now (#17126) 2023-06-04 18:49:17 -06:00
Nemanja
69f6756cae Replace industrial welder with experimental welder for Advanced Tools (#17127) 2023-06-04 17:23:27 -05:00
Sir Winters
09d16964c4 Chef Guidebook (#17120)
Co-authored-by: Owai-Seek <>
Co-authored-by: Moony <moony@hellomouse.net>
2023-06-04 16:34:29 -05:00
Sir Winters
704a6e8f70 Medical Doctor guidebook. (#16769)
* Medical Doctor guide.

* small wording update and cauterization

* Minor adjustments, move Cloning and Cryo out of MD

* Update Cryo Text + Guidehelp Tags

* Update Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml

---------

Co-authored-by: Owai-Seek <>
Co-authored-by: Moony <moony@hellomouse.net>
2023-06-04 16:06:42 -05:00
Nemanja
b9fb66f005 Chem guidebook (#17123)
* im good at atomizing. welcome to half-finished chem guides.

* wagh

* e

* save work

* aa

* woweee UI

* finishing the last of it

* don't actually update the engine :(

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-06-04 15:45:02 -05:00
Sailor
7252b9e1e9 Origin update (#17119)
* Origin update

* Update psychologist desc loc

* I👉😏👈, Eva X🆒😎, humbly😶 submit😐 , a 🍷toast🍞, to Nikolas😮Alexander🇷🇺, for ✔successfully✔managing 🆓️ to pirate🏴 Warcraft 3👹, so 🙄 that 😏 he 😐👉♂️ may  play 💻Defense🛡️of The⚔Ancients🏛. 👏👏👏Congratulations 👏👏👏, Nik😎🥛. Enjoy 😍 your 😮👊 dota 📀.
2023-06-04 14:11:15 -06:00
deltanedas
d36b93a4d7 add records console to aghost (#17091)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-04 21:32:03 +10:00
deltanedas
5906ec24f2 dungeon carp and dragon (#17040)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-04 21:06:13 +10:00
deltanedas
9ddba694f2 change 70 liter volume tanks to 15 liter (#17106) 2023-06-03 18:09:37 -06:00
Nemanja
ccc2648776 Fix being able to set spray amounts in bottles and vapor sprites (#16795) 2023-06-03 12:31:50 -07:00
Tom Leys
4cc988b668 Flesh Anomaly spawns a lot more kudzu (#16800) 2023-06-03 12:31:10 -07:00
Vordenburg
49ba959b82 Support multiple containers for HealingComponent (#16867) 2023-06-03 12:30:20 -07:00
Vordenburg
d8c05d013e Triple strength of THC (#16866) 2023-06-03 12:29:46 -07:00
Pieter-Jan Briers
042d3437e3 Make electrocutions look nicer on the power monitor. (#16965) 2023-06-03 12:13:30 -07:00
lzk
66aa0969ba Add RadiationBlocker to uranium window (#17067) 2023-06-03 12:12:26 -07:00
deltanedas
2bef7bfa38 magic bread wand (#17044)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-03 12:08:52 -07:00
Sir Winters
c46e2f1d68 Adds some Janitorial GuideHelp tags. (#17090)
Co-authored-by: Owai-Seek <>
2023-06-03 12:07:06 -07:00
Renlou
e190771d09 Add funny hampter plushie (#17099) 2023-06-03 11:50:53 -07:00
HerCoyote23
6c18892ca4 Swords now use bladeslice.ogg (#17080) 2023-06-03 20:17:15 +10:00
brainfood1183
c99585c94f Toy Box filled with toys (ready for merge) (#16252) 2023-06-03 13:31:47 +10:00
lzk
9852bba847 Fix drinks.yml physicalDesc (#17063) 2023-06-01 22:40:18 -07:00
Nemanja
1c91205b93 add ointment and bruise packs to medfab (#17054) 2023-06-01 19:36:33 -06:00
icesickleone
a9e03f60f3 Fix cowelding tool healing blunt damage (#17046) 2023-06-02 10:53:24 +10:00
Chief-Engineer
3bebb0d5e7 bypass interaction range checks for aghosts (#16955) 2023-06-02 10:50:17 +10:00
themias
c40c2aac72 Fix failing MaterialArbitrageTest (#17047) 2023-06-02 10:43:28 +10:00
lzk228
4783a655a4 remove useless tip (#17000) 2023-06-01 03:09:44 -07:00