Commit Graph

525 Commits

Author SHA1 Message Date
QuoteFox
6ef789e343 Merge pull request #805 from ArchieBeepBoop/updates
Robustin's Syndicate Infiltrator PR from tee-gee
2021-01-03 05:43:35 +00:00
QuoteFox
9ce601112c Merge pull request #806 from DragonTrance/changeling-fix
Changeling size fix
2021-01-03 05:42:57 +00:00
QuoteFox
bf1e84193a Merge pull request #807 from DragonTrance/deconstructing
loom slapping fix
2021-01-03 05:42:17 +00:00
Archie
222d37751e Fixes blood and properly adds the char reagent to grilled items as well (you can overdose on it) 2021-01-03 01:58:45 -03:00
DragonTrance
e83cf212c1 loom slapping fix 2021-01-02 13:11:04 -07:00
DragonTrance
a4942904bd changeling size fix 2021-01-02 13:07:20 -07:00
kevinz000
8e51c88d0e Porting Robustin's Syndicate Infiltrator PR from tee-gee 2021-01-02 16:53:52 -03:00
QuoteFox
092a7fa5a1 Merge pull request #804 from quotefox/sexhud
New HTML arousal hud, with contextal options, plus new lewd features.
2021-01-02 14:34:31 +00:00
QuoteFox
a9575ffc21 Merge pull request #794 from lyricalpaws/master
Let synthliz and IPC have and be infected by nanites
2021-01-02 14:02:24 +00:00
QuoteFox
c209ed7596 Merge pull request #797 from ArchieBeepBoop/12gauge
High chaos midround blood cult
2021-01-02 14:02:06 +00:00
QuoteFox
1822adc29e Merge pull request #800 from DragonTrance/meow-mix
Meow Mix
2021-01-02 13:40:47 +00:00
QuoteFox
333f410476 New Arousal Hud
New Arousal Hud, much more user accessable with contextal options.
2021-01-02 13:39:17 +00:00
DragonTrance
f27bafe721 barsign meow mix fix 2021-01-01 12:30:40 -07:00
Archie
cab493231b Reagent fix pack 3 2021-01-01 02:21:45 -03:00
QuoteFox
aa2280113d Merge pull request #785 from DragonTrance/this-is-my-3rd-branch-i-hate-github-sometimes
Expander + VTEC upgrades Fix (times two)
2021-01-01 02:26:01 +00:00
QuoteFox
46a6ce19e7 Merge pull request #792 from Jay-Sparrow/master 2021-01-01 02:24:56 +00:00
QuoteFox
1f4c328d0d Merge pull request #795 from DragonTrance/granters-indication
Gives book granters an indication to how far until you master the subject
2021-01-01 02:24:30 +00:00
Archie
891e129260 a 2020-12-31 23:03:19 -03:00
Archie
77d741e7d6 Midround Cult 2020-12-31 23:01:40 -03:00
DragonTrance
e452c22972 book granters indicate progress 2020-12-31 13:44:47 -07:00
Chloe Carver-Brown
c2a937bb73 Changing Nanotrasen to Kinaris where needed 2020-12-31 17:58:25 +00:00
JaySparrow
35e65babb3 Disable Lewd Antag 2020-12-30 15:56:45 -06:00
kevinz000
10069637a5 Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
2020-12-30 00:42:50 -03:00
DragonTrance
529824b320 borg expander + vtec upgrades fix 2020-12-29 11:15:19 -07:00
Archie
d241229ba0 Merge remote-tracking branch 'upstream/master' into Surgery 2020-12-28 16:43:57 -03:00
QuoteFox
9c2c2a22e2 Merge pull request #773 from DragonTrance/deconstructing
Adds the Ability to deconstruct various objects
2020-12-28 19:34:37 +00:00
Ghom
8b918b1d82 Merge pull request #10630 from Citadel-Station-13/kevinz000-patch-17
Nerfs cloning
2020-12-27 06:42:41 -03:00
QuoteFox
d940287569 Merge pull request #777 from ArchieBeepBoop/drakeborg
Removes Drakeborgs
2020-12-27 08:59:00 +00:00
silicons
16cc9e35f7 Removes Drakeborgs 2020-12-27 05:55:38 -03:00
Archie
188cc10974 Merge remote-tracking branch 'upstream/master' into Surgery 2020-12-27 04:29:21 -03:00
Archie
5710e12cb5 Surgery ports 1 2020-12-27 04:25:28 -03:00
DragonTrance
9068e9c580 Update loom.dm 2020-12-25 14:14:52 -07:00
DragonTrance
57117b0017 why does my compiler do this i hate it 2020-12-25 13:39:51 -07:00
Archie
e23546c3a4 sleeper 2020-12-25 17:32:54 -03:00
Ghom
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
DragonTrance
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
QuoteFox
e6a7a295d2 Wash cum bug again
Muliple stacks break it..
2020-12-24 19:39:41 +00:00
QuoteFox
7fb3ed17f7 Merge pull request #755 from ArchieBeepBoop/reagentsagain
Ports reagents id removal and typepath usage
2020-12-23 17:48:37 +00:00
QuoteFox
7ea68c2cb0 Merge pull request #753 from Oposshim/Donk.Co
Donk.Corp-Port ✔️
2020-12-23 17:34:12 +00:00
Archie
41f0a84a87 Fire Extinguisher Reagents 2020-12-18 01:30:17 -03:00
Archie
48ede22c46 Merge remote-tracking branch 'upstream/master' into reagentsagain 2020-12-18 01:20:57 -03:00
Dahlular
55267f2be5 Merge pull request #760 from MalricB/euthanasia
Update ghost_role_spawners.dm
2020-12-09 22:50:34 -07:00
CygnusB
e19743a4a7 Update ghost_role_spawners.dm 2020-12-10 02:48:03 -03:00
Lin
a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
Oposshim
6e66585d13 donk boxes list 2020-12-09 12:28:39 -05:00
Oposshim
cb79e145f9 box /var fix 2020-12-09 12:03:46 -05:00
Oposshim
dbcfc8855c Dank.Corp
More variety + bonus sprites.
2020-12-08 00:13:31 -05:00
Dahlular
4fb6256a99 Revert "Borg expander + VTEC fix" 2020-12-06 13:44:28 -07:00
Dahlular
7944a4ccde IF I SEE THREE MORE NIGHTMARES IN ONE SHIFT I WILL SHIT
PLEASE. THIS IS A THREAT.
2020-12-06 13:29:58 -07:00
Dahlular
40b1495ff3 Merge pull request #714 from DragonTrance/borgupgrade-fix
Borg expander + VTEC fix
2020-12-06 13:22:11 -07:00