lolman360
|
b490873f2a
|
ff
|
2019-12-21 13:13:37 +11:00 |
|
lolman360
|
4c7cc3615e
|
ff
|
2019-12-21 12:48:09 +11:00 |
|
lolman360
|
3043a4f8c9
|
ghom help
|
2019-12-21 12:47:36 +11:00 |
|
lolman360
|
7048e4e5ab
|
hhh
|
2019-12-21 12:43:48 +11:00 |
|
lolman360
|
b02ffa2e2d
|
Update inhand_holder.dm
|
2019-12-21 12:40:41 +11:00 |
|
Putnam
|
758e66ac2d
|
yeah alcohol intolerance
|
2019-12-20 16:46:38 -08:00 |
|
r4d6
|
efdded7e48
|
Remove extra indentations
|
2019-12-20 18:38:47 -05:00 |
|
r4d6
|
bc70bc3882
|
Fix the nose boop.
|
2019-12-20 18:10:02 -05:00 |
|
Putnam
|
ef360838da
|
errors
|
2019-12-20 14:50:08 -08:00 |
|
Putnam
|
c810145fc1
|
also adds aphrodisiacs, slaps, all hypno as prefs
|
2019-12-20 14:47:09 -08:00 |
|
Ghommie
|
9db79ff958
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-20 23:40:21 +01:00 |
|
Ghom
|
a398b7c413
|
Merge pull request #10200 from Citadel-Station-13/kevinz000-patch-125
Adds 8 character save slots
|
2019-12-20 22:55:22 +01:00 |
|
Ghom
|
b581f97fba
|
Merge pull request #9563 from Thalpy/Superbases-goodbye
[TESTMERGE] Goodbye, superpH, you were too wild for our world.
|
2019-12-20 14:28:21 +01:00 |
|
Ghom
|
d33feb6c35
|
Merge pull request #9888 from Citadel-Station-13/kevinz000-patch-116
The high voltage from tasers can now set people with fire stacks (so things like dousing in fuel) on fire
|
2019-12-20 14:26:50 +01:00 |
|
Ghom
|
f56684a473
|
Merge pull request #9925 from Linzolle/cosmic-brain
change cosmic coat crafting recipe
|
2019-12-20 14:26:24 +01:00 |
|
Ghom
|
6d824c99cf
|
Merge pull request #10051 from kappa-sama/patch-9
puts our legion more up to date with tg's
|
2019-12-20 14:25:09 +01:00 |
|
Ghom
|
d52a469933
|
Merge pull request #10142 from Trilbyspaceclone/patch-244
Feast or Famine is shit. Makes CE hardsuit raditation proof hat wise, buffes its rest of body by 5
|
2019-12-20 13:36:02 +01:00 |
|
Ghom
|
e526f26f46
|
Merge pull request #10126 from Putnam3145/he-tweaks
Makes HE pipes realistically radiate away heat
|
2019-12-20 13:34:47 +01:00 |
|
Ghom
|
1748a5ee4b
|
Merge pull request #10054 from kappa-sama/patch-10
autolathe .357 speedloaders->bullets, surplus rifle bullets in hacked lathe
|
2019-12-20 13:27:35 +01:00 |
|
Ghom
|
9567d53007
|
I'm a god. How can you defeat a god? What a grand and intoxicating innocence, how can you be so naive?
|
2019-12-20 13:24:48 +01:00 |
|
Seris02
|
61ab3685f1
|
atmos firelock, changes to temp blocking
|
2019-12-20 14:14:01 +08:00 |
|
lolman360
|
6188ec034d
|
h
|
2019-12-20 16:10:13 +11:00 |
|
kevinz000
|
0feb54bf70
|
Update mob.dm
|
2019-12-19 17:54:01 -07:00 |
|
kevinz000
|
2f78c0a5db
|
Update mob.dm
|
2019-12-19 17:51:23 -07:00 |
|
Lin
|
8d54e8afcc
|
Merge pull request #10214 from Ghommie/Ghommie-cit472
Brings carbon action intent hotkeys down to living.
|
2019-12-19 23:42:06 +00:00 |
|
Lin
|
138b460af3
|
Merge pull request #10079 from Ghommie/Ghommie-cit438
Fixes reactive armor onmob overlays not updating when toggled and reactive teleport armor still using forceMove()
|
2019-12-19 23:26:53 +00:00 |
|
Lin
|
3dc00519fc
|
Merge pull request #9910 from Ghommie/Ghommie-cit390
Unmodularize gamemodes folder.
|
2019-12-19 23:23:20 +00:00 |
|
Linzolle
|
f3aa363a2e
|
drop
|
2019-12-19 17:19:07 -06:00 |
|
Lin
|
42d8228c75
|
Merge pull request #9722 from Ghommie/Ghommie-cit320
Umodularize saycode and meat slabs.
|
2019-12-19 23:03:48 +00:00 |
|
Lin
|
66c6659681
|
Merge pull request #10160 from Ghommie/Ghommie-cit453
Ports improved and simplier fire alarms.
|
2019-12-19 23:00:52 +00:00 |
|
nik707
|
c1be6ba222
|
Merge pull request #10067 from Sishen1542/botnayn
You can change a plant's name, description and its seed's description by using a pen on the seed
|
2019-12-19 16:03:22 -06:00 |
|
nik707
|
63dd3487b3
|
Merge pull request #10090 from Hatterhat/the-one-where-a-4-tc-nukies-kit-gets-buffed
the one where the combat medic kit gets buffed
|
2019-12-19 14:11:27 -06:00 |
|
Putnam
|
f2b46f0951
|
ROBUST OPTING MECHANICS
|
2019-12-19 11:14:02 -08:00 |
|
Putnam
|
9ec2c8a7f1
|
MKUltra made double opt-in
|
2019-12-19 09:54:34 -08:00 |
|
Ghommie
|
a46982efe3
|
F
|
2019-12-19 17:40:22 +01:00 |
|
Ghommie
|
fb2b259d92
|
Ports "Refactors can_see_reagents"
|
2019-12-19 17:17:18 +01:00 |
|
Ghommie
|
f1154bf840
|
wew
|
2019-12-19 16:45:08 +01:00 |
|
Ghommie
|
88978209fa
|
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly"
|
2019-12-19 16:42:25 +01:00 |
|
Ghommie
|
871a1aebdc
|
Hello darkness my old friend.
|
2019-12-19 13:56:00 +01:00 |
|
kevinz000
|
e8e97021b3
|
Merge pull request #10229 from B1gb3ast/master
Fixes nonfunctional code so that tongues can taste strong flavors
|
2019-12-19 04:06:07 -07:00 |
|
kevinz000
|
23f7815c52
|
Merge pull request #10204 from r4d6/patch-2
Port boops and handshakes
|
2019-12-19 04:01:52 -07:00 |
|
Ghommie
|
70e8026411
|
two more PRs.
|
2019-12-19 11:59:15 +01:00 |
|
kevinz000
|
dcca9eb0d6
|
Merge pull request #10223 from BlackMajor/Yeehaw
Removes Security K9 dogborg. The last of the infinity dogborg removals. (same treatment as the others)
|
2019-12-19 03:24:36 -07:00 |
|
Ghommie
|
b56d2ff276
|
Stops humanoids whose skin_tone variable is set to "albino" from showing up as pale when examined should their species not use skintones anyway.
|
2019-12-19 11:19:00 +01:00 |
|
lolman360
|
e8dc9480b0
|
AAAAAAAAAAAAAAAAAAAA
|
2019-12-19 18:30:38 +11:00 |
|
lolman360
|
d8f0e983f1
|
lolman acctually knows how the stuff work
|
2019-12-19 18:24:24 +11:00 |
|
lolman360
|
8fc095d63e
|
Update carbon.dm
|
2019-12-19 17:29:35 +11:00 |
|
Ghommie
|
8566e2396d
|
Brings in some mapping code updates.
|
2019-12-19 00:44:14 +01:00 |
|
B1gb3ast
|
21c77cbdf1
|
modular man bad.
now mörge this so chefs can make delicious dish, hemk.
|
2019-12-18 23:36:32 +01:00 |
|
Ghommie
|
ba851d55b6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit456
|
2019-12-18 19:42:41 +01:00 |
|