 Ghommie
|
a97c2f66a5
|
Putnam's suggestions.
|
2020-04-24 03:44:12 +02:00 |
|
|
Ghommie
|
0beb28d3bb
|
reagents value nerf and standardization.
|
2020-04-23 19:52:22 +02:00 |
|
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
|
Ghommie
|
571584901c
|
Custom skin tone preferences.
|
2020-04-14 19:10:28 +02:00 |
|
|
Artur
|
f910a0fd32
|
Conflict fixes
|
2020-04-14 09:27:54 +03:00 |
|
|
kevinz000
|
8604297dcd
|
Merge pull request #11811 from Ghommie/Ghommie-cit671
Fixes and standarizes a few liver troubles. Re-enables liver failure.
|
2020-04-12 17:01:50 -07:00 |
|
|
spookydonut
|
230e5fca20
|
fix everything
|
2020-04-11 15:32:09 +08:00 |
|
|
Ghommie
|
af55880794
|
Fixes and standarizes a few liver troubles. Re-enables liver failure.
|
2020-04-10 17:22:34 +02:00 |
|
|
Lin
|
c2cbad81dd
|
what the fuck
|
2020-04-08 19:00:18 +00:00 |
|
|
Artur
|
c6a8515297
|
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
|
2020-03-24 12:36:21 +02:00 |
|
|
Ghommie
|
76ff0d4931
|
M/F body preferences.
|
2020-03-22 19:47:48 +01:00 |
|
|
Artur
|
ba972cf0eb
|
Argh
|
2020-03-18 22:41:21 +02:00 |
|
|
Ghommie
|
ee1eea8874
|
Ports "Switches out the three billion args of electrocute act for flags"
|
2020-03-09 04:01:23 +01:00 |
|
|
Putnam
|
ddd4d14477
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into eigenstasium-nope
|
2020-03-06 22:57:12 -08:00 |
|
|
Putnam
|
c221135849
|
eigenstasium no longer encourages certain personalities
|
2020-03-06 14:58:33 -08:00 |
|
|
Ghom
|
65b7833738
|
Merge pull request #11336 from Putnam3145/mkultra-aaa
Makes MKUltra's explosion no longer spread prefbreak gas
|
2020-03-06 21:47:14 +01:00 |
|
|
Putnam
|
658489a15a
|
no this is how you do it.
|
2020-03-05 11:26:42 -08:00 |
|
|
Putnam
|
52045a659b
|
Made MKUltra use the default explosion.
|
2020-03-05 11:15:54 -08:00 |
|
|
Artur
|
5d3f3fc06a
|
WIP
|
2020-02-28 14:11:38 +02:00 |
|
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
|
kevinz000
|
275b1f73e0
|
Merge pull request #10849 from Ghommie/Ghommie-cit547
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-04 03:39:14 -07:00 |
|
|
kevinz000
|
c24c83c1bd
|
Merge pull request #10835 from Ghommie/Ghommie-cit546
Something about runtime errors.
|
2020-02-02 16:31:15 -07:00 |
|
|
Ghom
|
6f66d76680
|
Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
|
2020-02-02 19:08:57 +01:00 |
|
|
kevinz000
|
333c0dd201
|
Update modular_citadel/code/modules/reagents/reagents/cit_reagents.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-02 01:32:54 -07:00 |
|
|
Ghommie
|
8de11845d5
|
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-02 03:39:49 +01:00 |
|
|
Ghommie
|
8923810de2
|
Something about runtime errors.
|
2020-02-01 07:19:49 +01:00 |
|
|
ancientpower
|
60476560cf
|
concatenation tweak
|
2020-01-31 18:23:13 -06:00 |
|
|
ancientpower
|
c5e5092749
|
fixes a typo with ph strips and adds feedback
|
2020-01-31 17:29:52 -06:00 |
|
|
Putnam
|
7626750c49
|
hypno tweaks
|
2020-01-28 23:03:29 -08:00 |
|
|
kevinz000
|
611fd7ea89
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-27 23:35:35 -07:00 |
|
|
kevinz000
|
d86af199f5
|
initialize
|
2020-01-24 21:22:59 -07:00 |
|
|
Ghommie
|
6fe0c57c42
|
run-extra-times fixes.
|
2020-01-24 20:48:32 +01:00 |
|
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
|
Putnam
|
253a3a44ba
|
moved "aphro" magic string to a define
|
2020-01-15 20:15:40 -08:00 |
|
|
Putnam
|
48fadffbfb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-10 17:57:03 -08:00 |
|
|
Putnam
|
cd35e516ac
|
back by popular demand: maso/nympho
|
2020-01-07 17:01:14 -08:00 |
|
|
kevinz000
|
7378d91684
|
([\W\.])Knockdown\(
|
2020-01-06 03:39:20 -08:00 |
|
|
Putnam
|
32043a9062
|
whoops forgot permaboner
|
2020-01-06 01:14:00 -08:00 |
|
|
Putnam
|
218e701fa9
|
whoops forgot update appearance
|
2020-01-05 21:48:04 -08:00 |
|
|
Putnam
|
e7684f5df7
|
whoops forgot to use sensitivity
|
2020-01-05 19:29:23 -08:00 |
|
|
Putnam
|
fba7a8abb0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-05 19:12:28 -08:00 |
|
|
Putnam
|
d75a525b3c
|
let's fix arousal huh
|
2020-01-05 19:10:48 -08:00 |
|
|
Ghommie
|
592422ee70
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-05 22:53:00 +01:00 |
|
|
Ghom
|
0e74c94d8c
|
Merge pull request #10278 from Trilbyspaceclone/patch-248
Fixes Fermi plushie reaction. Removes carbonation of caramel
|
2020-01-05 15:17:14 +01:00 |
|
|
Trilbyspaceclone
|
e0e3f1547c
|
Update fermi.dm
|
2020-01-04 18:09:51 -05:00 |
|
|
Trilbyspaceclone
|
f06e20234b
|
Hey guess who looked all over and got told were these files are
|
2020-01-04 06:17:49 -05:00 |
|
|
Ghommie
|
f5b251db66
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-03 18:24:39 +01:00 |
|
|
Lin
|
b1ccd512db
|
Merge pull request #10215 from Ghommie/Ghommie-cit473
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
|
2020-01-03 00:00:51 +00:00 |
|
|
Ghommie
|
62cf03272d
|
work.
|
2019-12-30 16:22:05 +01:00 |
|
|
Ghommie
|
49f1176170
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-30 16:06:16 +01:00 |
|