 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 |
|
|
Ghom
|
481371bca7
|
Merge pull request #10193 from Commandersand/yeet
gamer is now filtered for clowns
|
2019-12-20 13:15:54 +01:00 |
|
|
lolman360
|
6188ec034d
|
h
|
2019-12-20 16:10:13 +11:00 |
|
|
r4d6
|
61a702bad5
|
Merge remote-tracking branch 'upstream/master' into substationV2
|
2019-12-19 23:51:14 -05: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
|
8511c44f0f
|
Merge pull request #10199 from Ghommie/Ghommie-cit467
Fixing and cleaning up the blood bank generator code.
|
2019-12-19 23:39:17 +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 |
|
|
r4d6
|
4608b3852d
|
Add the file for making the submaps actual ruins
|
2019-12-19 15:28:46 -05:00 |
|
|
r4d6
|
dbf3e7d246
|
Add the landmarks
|
2019-12-19 15:27:45 -05:00 |
|
|
r4d6
|
22d89a9435
|
Add the stuff to seed the station with rooms
|
2019-12-19 15:26:43 -05:00 |
|
|
r4d6
|
9672f98de3
|
Fix a possible alert
|
2019-12-19 15:24:56 -05:00 |
|
|
r4d6
|
ac1719810f
|
Adding a list for the stations rooms
|
2019-12-19 15:23:23 -05: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 |
|
|
nik707
|
dd62a9ca87
|
Merge pull request #10084 from Hatterhat/i-dont-test-my-code
i dont make good code
|
2019-12-19 14:10:18 -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
|
17306dbab4
|
Converts the main timsorts file from relative pathing to absolute pathing.
|
2019-12-19 16:14:40 +01:00 |
|
|
Ghommie
|
871a1aebdc
|
Hello darkness my old friend.
|
2019-12-19 13:56:00 +01:00 |
|
|
Ghommie
|
12aa266efe
|
Missed this one too.
|
2019-12-19 12:27:30 +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 |
|
|
kevinz000
|
8aca8b8f25
|
thank you based ghomtainer (when) 2x how did i not notice this
|
2019-12-19 04:00:37 -07:00 |
|
|
kevinz000
|
9436d218b4
|
thank you based ghomtainer (when)
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-19 03:59:57 -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 |
|
|
kevinz000
|
eee52655ef
|
Update flashbang.dm
|
2019-12-19 01:57:28 -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 |
|
|
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 |
|
|
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 |
|
|
DeltaFire
|
e546a59214
|
Magic number man bad, also all heads can spam CC now
|
2019-12-18 19:29:35 +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 |
|