shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,317 Commits 5 Branches 0 Tags
4fc30ce8ae92c22ddbb0fecea72d8b00a9ec9c68
Commit Graph

289 Commits

Author SHA1 Message Date
deathride58
578eb440c1 If you know, you know; fixes a decade-old typo, essentially mirroring RP's typo fix 2022-07-20 16:51:38 -04:00
BlueWildrose
f235839351 Adds carcinisoprojection jelly, a limb regrowth chem that is made from slime mutation toxin & blood (#15053) 
* Limb regrowth chem, new disease of crab cancer

* Limb regrowth adjustments

* oops, sorry linters.

* oh right this would probably fuck with dullahans

* woops missed a newline

* Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

* just realized this check is unnecessary.

* let's add a mood debuff while we're at it

* Update medicine_reagents.dm

* add a bounty

* misspelling

* Update crabcancer.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2022-04-15 00:37:08 +02:00
silicons
dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles 
/obj/mecha ➡ /obj/vehicle/sealed/mecha
 2022-04-08 18:26:47 -07:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
BlueWildrose
ac1c3511b1 Advanced mutation toxin nerf; new cure, removes instant subspecies transformation (#15497) 
* Advanced mutation toxin nerf

* Adv Mut Toxin nerf fix - needs all cures to FALSE
 2022-03-22 17:17:18 +01:00
SandPoot
f7ea1f377d oops, replace all is a hell of a drug 2022-02-25 17:09:31 -03:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
silicons
ce6e8c99c6 fixes 2022-02-15 21:56:36 -07:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
silicons
f4658b49b1 Merge pull request #14991 from bunny232/master 
Polyvitiligo now actually does something instead of making you a crayon eater.
 2021-08-15 00:20:35 -07:00
bunny232
f3363c7b4e Update skin.dm 2021-08-08 09:05:47 -04:00
Artur
5acd7fef2d makes salglu not deadly 2021-08-02 21:54:47 +03:00
Artur
2adfbea215 Merge remote-tracking branch 'origin/master' into fake_blood 2021-07-23 18:50:09 +03:00
silicons
a73ca4be46 scope creep lmao 2021-06-28 12:29:18 -07:00
Putnam
3b25f3e199 Started expanding auxgm a bit 2021-06-10 04:40:23 -07:00
Putnam
86177c51c4 auxgm part 1 
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
 2021-06-08 09:54:28 -07:00
Artur
35bfba1f6a Redoes the variable changes into procs 2021-05-05 18:15:13 +03:00
Artur
92e6646a4c time to make blood even more pain 2021-05-05 14:44:21 +03:00
rossark
2b2dc88d6f viro symptom typo fix (#14600) 
fixes a  typo stating wrong treshold
 2021-04-12 18:39:24 +02:00
raspy-on-osu
622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
silicons
8f7b483161 remove reverb 2021-01-13 21:37:30 -07:00
Letter N
51143f89e5 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-29 10:37:06 +08:00
DeltaFire
312f3410a1 Merge pull request #13887 from HeroWithYay/Fix_Necrotizing_Fasciitis_description 
Fix for Necrotizing Fasciitis
 2020-12-28 17:43:39 +01:00
Putnam
fd8f5c4afd Makes coma more precedent. 2020-12-27 17:54:53 -08:00
Putnam
33358776ec Makes regen coma properly work at 25% when sleeping 2020-12-27 17:49:15 -08:00
HeroWithYay
d06c82ae64 It has the wrong description, fixing it. 2020-12-28 03:21:41 +13:00
raspy-on-osu
0e652cb64c init 2020-12-26 06:02:09 -05:00
Letter N
56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
Zandario
fcd8fec815 Fixes an oversight and updates some defines (#13558) 2020-10-17 12:37:58 +02:00
DeltaFire
a5fce4b6ed Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2 2020-10-11 15:39:41 +02:00
DeltaFire
06cb91ca3d updates all BODYPART_ORGANIC occurances 
:)
 2020-10-06 18:01:25 +02:00
Zandario
1620e3887c Merge branch 'master' into species-refactor 2020-10-02 17:19:48 -05:00
Zandario
bdd121cd81 Prep Work 2020-10-02 17:17:50 -05:00
Putnam
9f871dfa17 Makes shivering and fever not broken. 2020-09-26 11:22:24 -07:00
Artur
3fb72e0fea Merge remote-tracking branch 'upstream/master' into TGUI_Updoot 2020-09-04 11:43:31 +03:00
Ghommie
a455092c1f aaaa 2020-09-02 19:27:04 +02:00
Ghommie
dc9b024fae Blemishes begone. 2020-09-02 19:16:16 +02:00
Artur
a2d34b7524 Undoes Theme shit 2020-09-02 19:44:19 +03:00
Timothy Teakettle
f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00
silicons
4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
Timothy Teakettle
033fe553e8 cease your shitcode 2020-08-10 21:41:06 +01:00
timothyteakettle
584e74590f port1 2020-07-17 02:01:33 +01:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
Ghommie
65ffadaa18 Few issues, solved. 2020-06-28 04:51:02 +02:00
kevinz000
445d94f335 haha whew 2020-06-17 21:32:10 -07:00
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280) 
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
 2020-05-17 16:35:17 -07:00
Putnam
8458f97692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-12 13:34:31 -07:00
kevinz000
395d434e6e Merge pull request #12200 from Ghommie/Ghommie-cit738 
nutrition adjustment wrapper procs from tg.
 2020-05-12 12:28:02 -07:00