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
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
Putnam
f4f80594bd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-05-11 17:10:55 -07:00
Putnam
e8d7da56f4
Ported C++mos from yogs (help me)
2020-05-11 15:44:26 -07:00
kevinz000
1cf2311930
Merge pull request #12164 from Ghommie/Ghommie-cit733
...
Porting "Refactors language holder"
2020-05-10 14:16:42 -07:00
Ghommie
667c12d413
nutrition adjustment wrapper procs.
2020-05-10 21:41:50 +02:00
Putnam3145
3531459d8b
Some trauma rebalancing ( #12144 )
...
* Some trauma rebalancing.
* Wow I didn't actually commit the 50% change
* when did i stop compiling before pushing
2020-05-09 01:42:39 +02:00
Ghommie
2858ddd90b
Porting "Refactors language holder"
2020-05-08 22:44:02 +02:00
Ghommie
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
ForrestWick
0a54f8a7a0
I'M SORRY MR GITHUB PLS DONT BEAT ME
2020-04-09 17:27:18 -05:00
Putnam3145
368d47aa69
Adds ghost role eligibility to various ghost roles. ( #11549 )
...
* Added ghost role eligibility to CTF, possession, random animal
* Also added possessed blade to it.
* Also removed some extraneous dead/observer things.
* ahaha whoops
2020-03-22 13:02:23 +01:00
Ghommie
5e5bdec85d
More runtime errors.
2020-03-16 01:55:02 +01:00
kevinz000
b8642c5622
Merge pull request #11424 from necromanceranne/death_coma_stuff
...
Some fakedeath fixes requested by kev also ports a fix from tg to regen coma
2020-03-11 17:24:03 -07:00
necromanceranne
c37d30a617
Some fixes requested by kev also ports a fix from tg
2020-03-11 15:43:47 +11:00
Seris02
cccd0e9eef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-03-09 16:49:32 +08:00
kevinz000
1e99cd0bfe
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
Ghommie
c0ff43f827
ofc, New arguments.
2020-03-01 16:34:43 +01:00
Ghommie
b0922dd70d
Actually..
2020-03-01 16:02:58 +01:00
Ghommie
893cca97a3
An old oversight with disease/var/viable_mobtypes.
2020-03-01 15:59:42 +01:00
