188cc10974
Merge remote-tracking branch 'upstream/master' into Surgery
2020-12-27 04:29:21 -03:00
482ba4a8ee
Merge pull request #10806 from Feasel/master
...
[Balance Patch - Tend Wounds Edition]
2020-12-27 04:27:52 -03:00
c27dbcaf5f
Merge pull request #9522 from Linzolle/tend-wounds
...
Tend Wounds + Make Revival more accessible
2020-12-27 04:27:29 -03:00
5710e12cb5
Surgery ports 1
2020-12-27 04:25:28 -03:00
aa58dec5f4
Merge pull request #771 from ArchieBeepBoop/blood2
...
Pooj Blood Code Cleanup
2020-12-27 07:10:40 +00:00
3a2d7212df
Merge pull request #775 from ArchieBeepBoop/reagentfix2
...
More Reagents fixed
2020-12-27 07:10:09 +00:00
cb0d36aaf3
DNC is now worth no points.
...
DNC is now worth no points, having a DNC and used to give you 2 whole points, making it harder for medical seems abit outragous, If you want the roleplay or challange, you shouldnt be rewarded for wasting peoples time and then raging in dead chat about medical staff not knowing how to fix people.
2020-12-27 05:55:37 +00:00
7c549e6b1e
more reagents
2020-12-27 01:42:51 -03:00
f390fbc8b5
Merge pull request #774 from quotefox/heat
...
Heat and Detect Heat Lewd Traits
2020-12-26 22:21:25 +00:00
b3aecde046
Merge pull request #765 from DragonTrance/corpseflower
...
Corpse Flower
2020-12-26 21:50:41 +00:00
3588d4044c
Heat Traits
...
For fun and for anyone wanting to do their heat/breeding fetish. Opt-in required.
2020-12-26 20:57:09 +00:00
9068e9c580
Update loom.dm
2020-12-25 14:14:52 -07:00
57117b0017
why does my compiler do this i hate it
2020-12-25 13:39:51 -07:00
e23546c3a4
sleeper
2020-12-25 17:32:54 -03:00
0c8ed89992
Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
...
Cleanup/Partial revert of RGB blood ""rework""
2020-12-25 17:30:06 -03:00
162ae674c6
constructible showers, loom, sinks & barrels now deconstruct
...
Deconstruction:
Loom - Screwdriver
Wooden Barrel - Screwdriver
Sink - Wrench
Shower - Screwdriver > Wrench
Securing:
Loom - Wrench
Wooden Barrel - Wrench
Shower - Screwdriver
Adds showers as craftable objects when using metal sheets. Also organizes some things in the metal sheet crafting menu
2020-12-25 13:22:21 -07:00
bcc26045aa
Merge pull request #770 from ArchieBeepBoop/reagentfix1
...
Reagent Fix Pack 1.1
2020-12-25 19:49:00 +00:00
f9a7a97198
a
2020-12-25 11:25:43 -03:00
e6a7a295d2
Wash cum bug again
...
Muliple stacks break it..
2020-12-24 19:39:41 +00:00
f9d7b255b1
Cum over partner option
...
Cum over partner option
2020-12-24 19:10:47 +00:00
b2a1a63bb1
Reagent Fix Pack 1
2020-12-24 14:30:43 -03:00
b48fa01953
Adds a *squeak emote
2020-12-23 21:08:01 -08:00
a807a568a5
i feel like it shouldnt produce miasma while dead
2020-12-23 11:48:53 -07:00
eaaa0c16a6
Corpse Flower
...
aka brap farm
2020-12-23 11:21:20 -07:00
7fb3ed17f7
Merge pull request #755 from ArchieBeepBoop/reagentsagain
...
Ports reagents id removal and typepath usage
2020-12-23 17:48:37 +00:00
7ea68c2cb0
Merge pull request #753 from Oposshim/Donk.Co
...
Donk.Corp-Port ✔️
2020-12-23 17:34:12 +00:00
2a1761e8ad
Merge pull request #763 from ArchieBeepBoop/fixes-the-bugs
...
Fixing some annoying bugs.
2020-12-22 00:52:55 +00:00
b9fe810525
Merge pull request #9959 from Ghommie/Ghommie-cit397
...
patching some combat mode edge cases and issues.
2020-12-20 11:32:28 -03:00
41f0a84a87
Fire Extinguisher Reagents
2020-12-18 01:30:17 -03:00
48ede22c46
Merge remote-tracking branch 'upstream/master' into reagentsagain
2020-12-18 01:20:57 -03:00
5723e57f90
Merge pull request #757 from ArchieBeepBoop/smite
...
Tabletide Stationwide
2020-12-16 13:14:18 +00:00
55267f2be5
Merge pull request #760 from MalricB/euthanasia
...
Update ghost_role_spawners.dm
2020-12-09 22:50:34 -07:00
e19743a4a7
Update ghost_role_spawners.dm
2020-12-10 02:48:03 -03:00
3623847696
Merge pull request #754 from MalricB/euthanasia
...
[READY TO MERGE] Aurora Aquilae, like Aurora Caelus but a bit terrifying. Also minor tweak to Aurora Caelus.
2020-12-09 19:22:28 -07:00
328b8d740c
better timing
2020-12-09 23:09:19 -03:00
04940e933e
Update aurora_aquilae.dm
2020-12-09 23:00:36 -03:00
2c62f345a3
sound
2020-12-09 21:26:44 -03:00
349a05110d
tabletide stationwide
2020-12-09 21:09:29 -03:00
f82c44574f
Destination: removal of debug messages
2020-12-09 20:42:52 -03:00
ca66c22bda
makes everyone get shot in the streets of detroits at the same time
2020-12-09 20:26:33 -03:00
3c940086be
v1
2020-12-09 20:14:12 -03:00
e8c475fd45
Update aurora_aquilae.dm
2020-12-09 19:42:47 -03:00
6ef2e78b4a
Update aurora_aquilae.dm
2020-12-09 18:45:42 -03:00
3deabef5b8
Update aurora_aquilae.dm
2020-12-09 17:53:11 -03:00
d297b49390
why aren't you working
2020-12-09 17:39:34 -03:00
a676c2f082
Update aurora_aquilae.dm
2020-12-09 17:28:50 -03:00
d69fff8cea
Update aurora_aquilae.dm
2020-12-09 15:40:04 -03:00
ff4d63e8e0
a sort of recipe tweak addon
2020-12-09 13:10:46 -05:00
838c20c200
Merge remote-tracking branch 'upstream/master' into reagentsagain
2020-12-09 14:32:55 -03:00
a7c539ac32
Ports reagents id removal and typepath usage.
2020-12-09 14:32:36 -03:00
Archie