705b12fc50
Merge pull request #8724 from Trilbyspaceclone/Rnd_brakeup
...
Brakes up Blue space Rnd tech nodes
2019-07-14 14:20:03 -07:00
da8b43f054
Merge pull request #8785 from Trilbyspaceclone/Just_Smile!
...
Makes Clowns and HonkMother Chaplins smile!
2019-07-14 14:11:09 -07:00
2ec5d3f02e
Merge pull request #8886 from Ghommie/Ghommie-cit137
...
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-14 14:05:20 -07:00
b153294a24
Merge pull request #8857 from Ghommie/Ghoomie-cit127
...
Refactoring underwear to allow custom color preferences.
2019-07-14 03:38:45 -07:00
44474ddbd0
Merge pull request #8873 from Ghommie/Ghommie-cit131
...
Ports "Fixes clockwork armor armor"
2019-07-14 03:38:04 -07:00
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
735fc5fab6
Merge pull request #8845 from Ghommie/Ghommie-cit121
...
Tweaking the 🅱️ emoji icon.
2019-07-14 03:35:33 -07:00
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
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
8f410429de
Ports "Renames SSsqueak to SSminor_mapping"
2019-07-13 07:08:03 +02:00
31bd9104bb
Ports "Adds blueshirt items to sectech and defines them better."
2019-07-13 06:42:09 +02:00
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
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
280aa9da08
Merge pull request #8860 from Trilbyspaceclone/Zelus_oil
...
Zelus oil - CWC gear
2019-07-12 07:41:28 -07:00
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
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
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
d36bae06a7
Ports the Chem Master choose your pill PR plus post-improvements
2019-07-12 07:39:17 +02:00
ed9213066c
Speedports "Fixes clockwork armor armor"
2019-07-12 06:09:16 +02:00
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
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
6fa454dfe7
r
2019-07-11 09:01:57 +02:00
081c07098f
randomizing colors.
2019-07-11 08:08:07 +02:00
143410c176
Blame Poojawa for the issue.
2019-07-11 07:39:29 +02:00
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
146276014c
Update other_reagents.dm
2019-07-10 20:42:12 -04:00
48e15307c5
Update other_reagents.dm
2019-07-10 19:14:57 -04:00
ac9c672fa8
I guess this is better
2019-07-10 18:56:32 -04:00
ed89ac874b
this was fine
2019-07-10 18:44:14 -04:00
baf4529e52
Update other_reagents.dm
2019-07-10 18:32:10 -04:00
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
2717590e9f
No more fat smites
2019-07-10 21:01:41 +12:00
c9e13f8d62
better wording*
2019-07-10 02:43:18 -04:00
54c28b19af
Zelus indeed
2019-07-10 02:29:42 -04:00
e1ed96f419
Update other_reagents.dm
2019-07-09 23:08:11 -04:00
b03c197d0e
forgot the var
2019-07-09 22:58:13 -04:00
6240222ed7
Update other_reagents.dm
2019-07-09 21:58:22 -04:00
ba7c24a0ec
Refactoring underwear to allow custom color preferences.
2019-07-09 23:25:54 +02:00
b5cb68fc68
Merge pull request #8844 from Ghommie/Ghommie-cit120
...
Fixes rocket launchers, buffing their accuracy etc.
2019-07-09 08:30:44 -07:00
490ae9daf2
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-09 07:58:22 +02:00
e56fc559ed
Merge pull request #8748 from Citadel-Station-13/kevinz000-patch-15
...
Raises corpse miasma generation by 5x. Lowers miasma disease chance per mole by 10x. Miasma now does absolutely nothing unless there's enough of it in the air to actually flow into scrubbers so there's no invisible pockets of disease stuck everywhere.
2019-07-08 18:15:20 -04:00
9c0c4c8f59
Merge pull request #8683 from Citadel-Station-13/kevinz000-patch-3
...
Fixes end of round notify command, makes it so everyone can use it rather than just staff
2019-07-08 18:14:08 -04:00
42cee552fe
Merge pull request #8709 from Trilbyspaceclone/Fel_port_1
...
Ports "Fixes every issue in the slimes milestone. #44450 "
2019-07-08 18:10:46 -04:00
b8e34d1cab
Merge pull request #8704 from Citadel-Station-13/kevinz000-patch-12
...
[s] RCD logging
2019-07-08 18:07:27 -04:00
59577f8818
Merge pull request #8750 from Arturlang/Nanite_Brain_Damage_Fix
...
Fixes trauma healing nanites.
2019-07-08 18:07:04 -04:00
947d33129c
Merge pull request #8771 from Citadel-Station-13/kevinz000-patch-20
...
buffs wheelchair movespeeds/changes a floor in the equation to a round
2019-07-08 18:05:15 -04:00
82d527b760
Merge pull request #8765 from Ghommie/Ghommie-cit91
...
Merging the end-of-shift and its shuttle autocall announcements into one.
2019-07-08 18:04:27 -04:00
e391995b8e
Merge pull request #8792 from Citadel-Station-13/kevinz000-patch-51
...
Buffs integrated circuitry advanced lights
2019-07-08 17:56:12 -04:00
840cfb8ac0
Merge pull request #8818 from Citadel-Station-13/kevinz000-patch-53
...
fixes stimulum by changing one number
2019-07-08 17:54:56 -04:00
58189d1528
Merge pull request #8820 from Ghommie/Ghommie-cit104
...
Ports "Add cancel button to assault pod destination selector"
2019-07-08 17:54:08 -04:00
kevinz000