TrilbySpaceClone
|
525cedf16a
|
this just works
|
2020-02-24 11:45:47 -05:00 |
|
kevinz000
|
8cf41997f5
|
Merge pull request #11201 from Hatterhat/bows
really just a lot of shit about bows
|
2020-02-24 02:33:54 -07:00 |
|
kevinz000
|
43c17b4ab3
|
Merge pull request #11180 from Detective-Google/psych+paramedic
Adds epic and also cool paramedics [lazy tg port]
|
2020-02-24 02:30:36 -07:00 |
|
Detective-Google
|
0caed52ca5
|
removes the epic and cool access and makes it less epic and more cool
|
2020-02-24 03:28:33 -06:00 |
|
kevinz000
|
3e77952652
|
Merge pull request #11216 from Putnam3145/rename-logging
[S] Adds rename logging
|
2020-02-24 02:27:27 -07:00 |
|
kevinz000
|
59074d1174
|
Merge pull request #11183 from Trilbyspaceclone/patch-291
Removes more Trek armor.
|
2020-02-24 02:27:05 -07:00 |
|
kevinz000
|
4fc0ef5e74
|
Merge pull request #11185 from Trilbyspaceclone/J.A.S.O.N
Makes all IPC organs look robotic!
|
2020-02-24 02:24:06 -07:00 |
|
kevinz000
|
493d62c17e
|
Merge pull request #11184 from Trilbyspaceclone/patch-292
Remember when Kev made IPCs hearts no longer emp? Me ether!
|
2020-02-24 02:23:45 -07:00 |
|
kevinz000
|
73c03adbbb
|
Merge pull request #11199 from Detective-Google/pai.pai.pai.png
Lets pAIs hold encryption keys and play music.
|
2020-02-24 02:23:17 -07:00 |
|
Putnam
|
f7e0eb43f8
|
Adds rename logging
|
2020-02-23 22:53:20 -08:00 |
|
Ghom
|
565fa77cf9
|
Merge pull request #11162 from Hatterhat/quickpatch-enzyme
biogen enzyme fix, multitool basic tools node fix
|
2020-02-23 22:48:07 +01:00 |
|
kevinz000
|
ae42db8674
|
Merge pull request #11210 from Ghommie/Ghommie-cit588
[s] Fixing an issue with slot machines crashing the server.
|
2020-02-23 06:02:13 -07:00 |
|
Ghom
|
2075147ee9
|
Merge pull request #11206 from Trilbyspaceclone/patch-294
Corn dogs now have a sprite
|
2020-02-23 13:30:23 +01:00 |
|
Ghommie
|
2b740f9bad
|
[s] Fixing an issue with slot machines crashing the server.
|
2020-02-23 13:09:21 +01:00 |
|
TrilbySpaceClone
|
845e719ade
|
But what if we did it right?
|
2020-02-23 01:52:36 -05:00 |
|
Trilbyspaceclone
|
2dea3cf15c
|
Gives ash sandstone
|
2020-02-23 00:53:42 -05:00 |
|
Trilbyspaceclone
|
342f1cd4c1
|
Update snacks_meat.dm
|
2020-02-22 23:17:30 -05:00 |
|
Hatterhat
|
ba81184fef
|
Merge branch 'master' into quickpatch-enzyme
|
2020-02-22 18:06:17 -06:00 |
|
Ghom
|
0c558f53d9
|
Merge pull request #11179 from Trilbyspaceclone/patch-290
AIs now understand dwarf
|
2020-02-22 22:49:08 +01:00 |
|
Hatterhat
|
accc4ce776
|
grammar shit, silkstring buff, arrow costs, yikes
|
2020-02-22 15:33:07 -06:00 |
|
Ghom
|
520f5eab83
|
Merge pull request #11191 from YakumoChen/beelord
Beegions
|
2020-02-22 22:24:20 +01:00 |
|
Ghom
|
6f181365c2
|
Merge pull request #11172 from Trilbyspaceclone/bows!
Bow corrections.
|
2020-02-22 15:53:27 +01:00 |
|
Ghom
|
b7fab93209
|
Merge pull request #11186 from Putnam3145/fixed-flavor
Fixed temp flavor text (for real)
|
2020-02-22 15:09:58 +01:00 |
|
Putnam
|
d328d554ba
|
Reduced copypasta
|
2020-02-22 02:38:57 -08:00 |
|
kevinz000
|
856af1f182
|
Merge pull request #10848 from Ghommie/Ghommie-cit229
Porting Floyd Materials: Trying again edition
|
2020-02-21 23:28:44 -07:00 |
|
Detective Google
|
ca29246878
|
adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.)
|
2020-02-22 00:02:49 -06:00 |
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
YakumoChen
|
418374be06
|
beegion
|
2020-02-21 17:56:14 +00:00 |
|
Ghom
|
42416483e7
|
Merge pull request #11175 from keronshb/NaniteFixes
Fixes healing nanites
|
2020-02-21 16:46:19 +01:00 |
|
YakumoChen
|
2f2ddbad5a
|
removes density from skulls
|
2020-02-21 12:07:58 +00:00 |
|
YakumoChen
|
34f1b5d1c8
|
legion heads now swarm
|
2020-02-21 10:36:57 +00:00 |
|
Putnam
|
146b2a35f2
|
fixed temp flavor text (for real)
|
2020-02-21 00:26:42 -08:00 |
|
TrilbySpaceClone
|
7d8f1320b3
|
it looks nicer
|
2020-02-21 03:07:42 -05:00 |
|
Trilbyspaceclone
|
58df6486cb
|
Hey hey people, grammar here.
|
2020-02-21 03:06:38 -05:00 |
|
Trilbyspaceclone
|
f35ee95d67
|
Update heart.dm
|
2020-02-21 01:54:23 -05:00 |
|
Trilbyspaceclone
|
4542afa537
|
Update trek.dm
|
2020-02-21 01:14:09 -05:00 |
|
Detective Google
|
141bd96430
|
man FUCK psychs
|
2020-02-20 22:46:37 -06:00 |
|
Detective Google
|
4c10c830bf
|
Merge remote-tracking branch 'upstream/master' into psych+paramedic
|
2020-02-20 22:17:55 -06:00 |
|
Detective Google
|
a8f863f901
|
changes - sprites
|
2020-02-20 22:17:47 -06:00 |
|
Trilbyspaceclone
|
38f243e1c2
|
Update language_holder.dm
|
2020-02-20 22:15:32 -05:00 |
|
Ghom
|
8395ee53e7
|
Merge pull request #11156 from Psody-Mordheim/Plzgibsynthflesh
Virology Symptom Update : Now Featuring EVEN MORE PWRGAME
|
2020-02-21 02:47:18 +01:00 |
|
Ghom
|
e92183e968
|
Merge pull request #10541 from Detective-Google/the-p-o-o-l
adds the POOL to box station
|
2020-02-21 02:43:04 +01:00 |
|
keronshb
|
7a1bc9d22b
|
Fixes the travis issues
Fixes the travis issues, Exo still remains a mystery
|
2020-02-20 19:11:04 -05:00 |
|
keronshb
|
4ca9eb4171
|
Fixes healing nanites
Fixes Accelerated Regeneration, Bio Regen, and Mechanical.
Also changed one line on Exo nanites but it doesn't fix those. Dunno what to do.
|
2020-02-20 18:11:54 -05:00 |
|
Ghom
|
613158fe4e
|
Merge pull request #11157 from Putnam3145/lick-pref
Lick pref
|
2020-02-20 20:53:27 +01:00 |
|
Ghom
|
4649183a47
|
Merge pull request #11154 from Kraseo/fuck-nightmares
Fixes nightmares deleting guns with flashlights
|
2020-02-20 20:52:29 +01:00 |
|
Ghom
|
7763475b83
|
Merge pull request #10572 from Tupinambis/SiliconDefault
Removes harm prevention clause indicators from relevant sources.
|
2020-02-20 15:33:27 +01:00 |
|
Ghom
|
6347dab0a3
|
Merge pull request #11142 from kevinz000/vampire_haste
makes vampire haste more reliable and slightly less of an example of how not to code
|
2020-02-20 15:31:39 +01:00 |
|
Ghom
|
608bb0a04c
|
Merge pull request #10649 from kevinz000/hijack
Completely reworks the hijack objective, and shuttle hijacking in general
|
2020-02-20 14:40:08 +01:00 |
|
kevinz000
|
ca777c6c8b
|
Merge pull request #11153 from Ghommie/Ghommie-cit587
Fixing addiction moodlets not going away and secret sauce recipe paper.
|
2020-02-20 06:17:33 -07:00 |
|