Commit Graph

11214 Commits

Author SHA1 Message Date
Putnam
5174cb08a6 Made war ops always allowed on teamwork, chaotic 2019-12-27 22:45:06 -08:00
Putnam
13a8efe616 no assassination at all (!!) on calm 2019-12-23 00:43:25 -08:00
Putnam
801c789419 made toggle more indicative 2019-12-22 13:14:49 -08:00
Ghom
2bc401e2d2 Merge pull request #10096 from Citadel-Station-13/kevinz000-patch-123
nanites can no longer spread through atmospherics-blocking objects
2019-12-21 16:48:56 +01:00
Ghom
5c3d3f4cc5 Is merging someone else's PR you personally fixed considerable as self-merging? 2019-12-21 16:40:32 +01:00
Ghom
4624a1739a typo 2019-12-21 16:30:02 +01:00
Ghom
aea2b8865e Merge pull request #10120 from Citadel-Station-13/night_vision
Night vision trait but it just boosts barely-lit visibility
2019-12-21 15:30:32 +01:00
Ghom
a384b1782b Merge pull request #10164 from kappa-sama/martialartist
What ho, Muscle Wizard! Might you cast us a spell?
2019-12-21 15:24:06 +01:00
Ghom
f30be0ace6 Merge pull request #10077 from ForrestWick/uplinkchanges
Moves brainwash surgery from role restricted to devices and tools in the uplink
2019-12-21 12:43:18 +01:00
Ghom
19fc981cc1 Merge pull request #9596 from Linzolle/abductor-update
Bring abductors up-to-date with /tg/.
2019-12-21 11:15:29 +01:00
Ghom
a7cda1aea0 Merge pull request #10059 from lolman360/HeadCorgi
you can pick up corgis now
2019-12-21 11:05:36 +01:00
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
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
lolman360
6188ec034d h 2019-12-20 16:10:13 +11: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
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
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
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
B1gb3ast
21c77cbdf1 modular man bad.
now mörge this so chefs can make delicious dish, hemk.
2019-12-18 23:36:32 +01:00
B1gb3ast
d011a7a3d9 oh hey macros.
slightly less ugly ™
2019-12-18 19:35:36 +01:00
B1gb3ast
19b20f8385 im baby dumb and removed "a hint of" by accident.
Okay whoops haha there we go now both strong and weak should work.
2019-12-18 19:29:57 +01:00
B1gb3ast
7841faa3a9 Actually hold on
So that not everything in the game now tastes like STRONG FLAVOUR. That'd be annoying.
2019-12-18 19:24:25 +01:00
Ghommie
f945577655 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit320 2019-12-18 19:20:38 +01:00
B1gb3ast
84a413a43a Chef buffs chef buffs tastier food.
"The strong flavor of" was always in game but someone put it behind an else if statement that would never proc.
Now if there's more than 45% (or 30% if you are a lizzard, hissss) of a reagent in a beaker, you will taste a strong flavor! 
Hurrah!
2019-12-18 17:37:08 +01:00
Linzolle
70e50e57cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-17 20:21:49 -06:00
kappa-sama
8da0ddda1b oops 2019-12-17 16:40:06 -05:00
Putnam3145
6b8f9427d0 Merge pull request #10153 from Linzolle/fireman-clarity
make unable to carry fireman message more clear when unable to carry non-humans
2019-12-17 12:09:08 -08:00
Putnam3145
c0e548427b Merge pull request #10076 from Ghommie/Ghommie-cit437
Fixes alien tech node not being unlockable with subtypes of the accepted items.
2019-12-17 11:58:39 -08:00