Commit Graph

6282 Commits

Author SHA1 Message Date
keronshb a2a8d74fd8 Vent and spawning 2021-09-09 20:12:47 -04:00
Lin 3f09f56e3d Merge pull request #15101 from Citadel-Station-13/silicons-patch-6
fixes the comedy antag parry gauntlets
2021-09-09 19:10:51 -05:00
silicons 69bd477a72 Merge pull request #15039 from keronshb/gradiantport
Ports Colorist Quirk and Hair Gradients Preferences
2021-09-08 20:41:00 -07:00
SandPoot 759852a31d Update inventory.dm 2021-09-08 20:02:23 -03:00
SandPoot 37e2470616 Upload files 2021-09-08 19:53:47 -03:00
silicons 7d62753fe4 Update living_active_parry.dm 2021-09-08 04:44:36 -07:00
silicons 5de5be462f Update colossus.dm 2021-09-08 02:36:40 -07:00
keronshb 2808e855b5 Explosive Pop fix 2021-09-06 10:30:41 -04:00
keronshb 5102cacdb4 Prevents them from spawning off station z 2021-09-06 09:50:21 -04:00
keronshb 468a610f15 Corpsefix 2021-09-06 09:31:45 -04:00
keronshb a8d1b377e4 Plaguefix 2021-09-05 21:22:53 -04:00
keronshb 8904950cf5 Gremlinfix 2021-09-05 14:35:38 -04:00
Lin 3b10346961 Merge pull request #15067 from timothyteakettle/fixes-synth-markings
makes the arm/leg markings for synthetic lizards appear as an option again
2021-09-03 13:52:15 -05:00
keronshb bf2b45050a Pai EMAG act 2021-09-03 13:46:59 -04:00
Putnam3145 2692f6285f Fixes a runtime in ghost update_icon
Please make sure that no overrides have arguments when you add a new argument to a method.
2021-09-03 01:21:21 -07:00
Lin 9b888c7b01 Merge pull request #15059 from timothyteakettle/language-fixies
fixes losing your additional language upon changing species
2021-09-02 16:37:43 -05:00
Timothy Teakettle cd04aed49e Update synthliz.dm 2021-09-02 18:35:52 +01:00
timothyteakettle a33a7ed249 fix 2021-09-01 17:54:14 +01:00
silicons d427c43b7b Merge pull request #15032 from keronshb/itemhighlight
Ports Inventory Outlines
2021-08-26 21:41:25 -07:00
silicons 3cae7df6c8 Merge pull request #15002 from keronshb/plaguerats
Plague Rats
2021-08-26 21:41:07 -07:00
silicons 13130b3ee6 Merge pull request #15015 from keronshb/gremlinport
Gremlin Port
2021-08-26 21:40:59 -07:00
silicons 2c69193337 Merge pull request #15037 from DeltaFire15/corpse-fix
Fixes demons scattering dropped bodies all over the station, plus space dragon content ejection
2021-08-26 21:38:29 -07:00
zerothebigboy dec2ea645e nuts 2021-08-26 22:57:22 -04:00
keronshb 47078e9a85 Ports Hair Gradiants 2021-08-26 11:58:09 -04:00
DeltaFire e87bd464ff sigh 2021-08-26 04:21:52 +02:00
DeltaFire c713dbdef1 carprift armor 2021-08-26 04:20:23 +02:00
DeltaFire 38aa220e6a no nullijng allowed 2021-08-26 04:02:22 +02:00
DeltaFire f8866774aa no scattering 2021-08-26 03:30:51 +02:00
keronshb 7070a848b6 Item Highlight Port 2021-08-22 00:21:06 -04:00
keronshb 0b8221c9ac Change to 20 minutes 2021-08-19 22:49:19 -04:00
zerothebigboy 06181f51ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	code/modules/ninja/suit/suit.dm
2021-08-19 21:55:22 -04:00
keronshb 1b43c5b1ae Merge remote-tracking branch 'upstream/master' into gremlinport 2021-08-17 09:03:09 -04:00
WanderingFox95 888c6fed15 Since apparently nobody knows what shark tails look like... 2021-08-16 13:52:24 +02:00
keronshb 45aed7a218 Gremlins 2021-08-15 23:48:24 -04:00
WanderingFox95 4a78d8a880 Separates the tails. 2021-08-15 02:21:09 +02:00
keronshb 5395a78410 Fixes linter 2021-08-12 13:24:31 -04:00
keronshb bf17f3c4ea Plague Rats
Here they come.
2021-08-12 12:56:33 -04:00
silicons 51dbc8e21f Merge pull request #14685 from Arturlang/fake_blood
Reworks blood regeneration into something a bit more tame
2021-08-11 02:54:49 -07:00
Lin 2ac89f4c12 Merge pull request #14989 from timothyteakettle/markings-for-all-i-guess
lets felinids, humans and moths have markings
2021-08-10 13:37:17 -05:00
Artur c7a17b0e84 Didn't properly renamy my var 2021-08-10 20:15:07 +03:00
Artur 09227544be Name's too similar 2021-08-10 15:00:54 +03:00
Artur 0ff2e0cee5 makes the amount of integrated_blood lost equal to the blood_volume gained 2021-08-10 15:00:12 +03:00
silicons 59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates
Ports update appearance
2021-08-08 04:06:18 -07:00
timothyteakettle 33e1ac1308 Update bugmen.dm 2021-08-07 22:30:43 +01:00
timothyteakettle 9b3a3d81d3 yes 2021-08-07 22:18:06 +01:00
Artur 5acd7fef2d makes salglu not deadly 2021-08-02 21:54:47 +03:00
BlueWildrose 0735ec66b3 Fixes brainless sprite being an error sprite 2021-08-01 06:33:08 -07:00
silicons 2a28bd90c7 Merge branch 'master' into silicons-patch-44 2021-07-29 22:41:57 -07:00
Artur 6b5bdae184 salglu works like normal now again and adds more sanity 2021-07-29 23:55:27 +03:00
Artur 4b2bffdff0 Actually makes it work by /obj/screen --> /atom/movable/screen 2021-07-29 14:06:18 +03:00