 MrJWhit
|
97072c63c8
|
Adds text to not disturb the habatat to abductor spawntext
Adds "Try not to disturb the habitat, it could lead to dead specimens." to the spawntext.
|
2019-09-07 13:52:08 -04:00 |
|
|
MrJWhit
|
77e0551616
|
Adds a line in the spawntext for IAA
Adds "By no means reveal that you, or any other NT employees, are undercover agents." at the spawntext
|
2019-08-09 13:56:07 -04:00 |
|
|
kevinz000
|
61bc43a0d7
|
Merge pull request #8693 from Ghommie/Ghommie-cit70
Ports "clothes burning only spam You of Your clothes"
|
2019-07-14 14:52:29 -07:00 |
|
|
kevinz000
|
628244c0ba
|
Merge pull request #8869 from Ghommie/Ghommie-cit129
Ports "Show codewords on round end screen"
|
2019-07-14 14:49:11 -07:00 |
|
|
kevinz000
|
c06d495731
|
Merge pull request #8877 from BurgerLUA/REMOVE-C8A5DC
REMOVE #C8A5DC. COLOR STRONG.
|
2019-07-14 14:48:49 -07:00 |
|
|
kevinz000
|
1564f38ff8
|
Merge pull request #8725 from Trilbyspaceclone/meme_tools
Adds more bronze tools
|
2019-07-14 14:48:27 -07:00 |
|
|
kevinz000
|
2c41141d2f
|
Merge pull request #8676 from Trilbyspaceclone/patch-176
Adds a Rapier for 8 Trilby cats
|
2019-07-14 14:46:44 -07:00 |
|
|
kevinz000
|
9de885da32
|
Merge pull request #8880 from CameronWoof/air-alarms-should-be-green
Makes Air Alarms Green
|
2019-07-14 14:20:54 -07:00 |
|
|
kevinz000
|
705b12fc50
|
Merge pull request #8724 from Trilbyspaceclone/Rnd_brakeup
Brakes up Blue space Rnd tech nodes
|
2019-07-14 14:20:03 -07:00 |
|
|
kevinz000
|
da8b43f054
|
Merge pull request #8785 from Trilbyspaceclone/Just_Smile!
Makes Clowns and HonkMother Chaplins smile!
|
2019-07-14 14:11:09 -07:00 |
|
|
kevinz000
|
2ec5d3f02e
|
Merge pull request #8886 from Ghommie/Ghommie-cit137
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-14 14:05:20 -07:00 |
|
|
kevinz000
|
b153294a24
|
Merge pull request #8857 from Ghommie/Ghoomie-cit127
Refactoring underwear to allow custom color preferences.
|
2019-07-14 03:38:45 -07:00 |
|
|
kevinz000
|
44474ddbd0
|
Merge pull request #8873 from Ghommie/Ghommie-cit131
Ports "Fixes clockwork armor armor"
|
2019-07-14 03:38:04 -07:00 |
|
|
kevinz000
|
d5f156925d
|
Merge pull request #8884 from Ghommie/Ghommie-cit135
Ports "About that beer I owed ya. Adds blueshirt items to sectech and defines them better."
|
2019-07-14 03:37:36 -07:00 |
|
|
kevinz000
|
735fc5fab6
|
Merge pull request #8845 from Ghommie/Ghommie-cit121
Tweaking the 🅱️ emoji icon.
|
2019-07-14 03:35:33 -07:00 |
|
|
kevinz000
|
2259ea2e1c
|
Merge pull request #8874 from Ghommie/Ghommie-cit132
Ports the Chem Master choose your pill PR plus post-improvements
|
2019-07-14 03:33:37 -07:00 |
|
|
Ghommie
|
129ca9d71f
|
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-13 10:27:39 +02:00 |
|
|
Ghommie
|
8f410429de
|
Ports "Renames SSsqueak to SSminor_mapping"
|
2019-07-13 07:08:03 +02:00 |
|
|
Ghommie
|
31bd9104bb
|
Ports "Adds blueshirt items to sectech and defines them better."
|
2019-07-13 06:42:09 +02:00 |
|
|
CameronWoof
|
d944c0bb27
|
Normalizes Air Alarms
|
2019-07-12 15:04:43 -07:00 |
|
|
kevinz000
|
c012418cf7
|
Merge pull request #8734 from Ghommie/Ghommie-cit84
Sort of porting "Changes the type pathing of some "random" items"
|
2019-07-12 07:43:12 -07:00 |
|
|
kevinz000
|
13b1e5d409
|
Merge pull request #8812 from Sishen1542/surgery-hugboxing
Using the wrong tool during surgery won't hit the patient with it. Also stops medical borgs from attacking with surgical tools outside of harm intent.
|
2019-07-12 07:42:11 -07:00 |
|
|
kevinz000
|
280aa9da08
|
Merge pull request #8860 from Trilbyspaceclone/Zelus_oil
Zelus oil - CWC gear
|
2019-07-12 07:41:28 -07:00 |
|
|
kevinz000
|
53642c5104
|
Merge pull request #8842 from UristMcAstronaut/master
allows pais to activate holoform while in a pai connector
|
2019-07-12 07:36:48 -07:00 |
|
|
kevinz000
|
1eaddd3ebf
|
Merge pull request #8853 from Ghommie/Ghommie-cit125
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
|
2019-07-12 07:34:19 -07:00 |
|
|
kevinz000
|
aeb2216551
|
Merge pull request #8843 from Coolgat3/tacticoolness
Makes combat boots look T A C T I C O O L
|
2019-07-12 07:33:36 -07:00 |
|
|
BurgerLua
|
5bd2f28d69
|
Removed #C8A5DC
|
2019-07-12 01:02:43 -07:00 |
|
|
Ghommie
|
d36bae06a7
|
Ports the Chem Master choose your pill PR plus post-improvements
|
2019-07-12 07:39:17 +02:00 |
|
|
Ghommie
|
ed9213066c
|
Speedports "Fixes clockwork armor armor"
|
2019-07-12 06:09:16 +02:00 |
|
|
kevinz000
|
c76f6b8a54
|
Merge pull request #8862 from BlackMajor/Burgit-Branch-2
Admin cream pie smite no longer makes its victims fat
|
2019-07-11 04:57:50 -07:00 |
|
|
Ghommie
|
92fadcf230
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit84
|
2019-07-11 09:07:11 +02:00 |
|
|
Ghommie
|
6fa454dfe7
|
r
|
2019-07-11 09:01:57 +02:00 |
|
|
Ghommie
|
bef0027287
|
In a haste, we forget thousand things.
|
2019-07-11 08:50:47 +02:00 |
|
|
Ghommie
|
26ab7cc522
|
Ports "Show codewords on round end screen"
|
2019-07-11 08:40:11 +02:00 |
|
|
Ghommie
|
081c07098f
|
randomizing colors.
|
2019-07-11 08:08:07 +02:00 |
|
|
Ghommie
|
143410c176
|
Blame Poojawa for the issue.
|
2019-07-11 07:39:29 +02:00 |
|
|
Trilbyspaceclone
|
27a8876e99
|
I dont care anymore, It works in testing to function fine
I dont see a problem is this, kinda would like citation on were Clockies will get added in the last else claim.
|
2019-07-11 01:15:39 -04:00 |
|
|
Trilbyspaceclone
|
146276014c
|
Update other_reagents.dm
|
2019-07-10 20:42:12 -04:00 |
|
|
Trilbyspaceclone
|
48e15307c5
|
Update other_reagents.dm
|
2019-07-10 19:14:57 -04:00 |
|
|
Trilbyspaceclone
|
ac9c672fa8
|
I guess this is better
|
2019-07-10 18:56:32 -04:00 |
|
|
Trilbyspaceclone
|
ed89ac874b
|
this was fine
|
2019-07-10 18:44:14 -04:00 |
|
|
Trilbyspaceclone
|
baf4529e52
|
Update other_reagents.dm
|
2019-07-10 18:32:10 -04:00 |
|
|
Trilbyspaceclone
|
d53d11de6b
|
Apply suggestions from code review
Grammer and such
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-07-10 18:21:03 -04:00 |
|
|
BlackMajor
|
2717590e9f
|
No more fat smites
|
2019-07-10 21:01:41 +12:00 |
|
|
Trilbyspaceclone
|
c9e13f8d62
|
better wording*
|
2019-07-10 02:43:18 -04:00 |
|
|
TrilbySpaceClone
|
54c28b19af
|
Zelus indeed
|
2019-07-10 02:29:42 -04:00 |
|
|
Trilbyspaceclone
|
e1ed96f419
|
Update other_reagents.dm
|
2019-07-09 23:08:11 -04:00 |
|
|
Trilbyspaceclone
|
b03c197d0e
|
forgot the var
|
2019-07-09 22:58:13 -04:00 |
|
|
Trilbyspaceclone
|
6240222ed7
|
Update other_reagents.dm
|
2019-07-09 21:58:22 -04:00 |
|
|
Ghommie
|
ba7c24a0ec
|
Refactoring underwear to allow custom color preferences.
|
2019-07-09 23:25:54 +02:00 |
|