Thalpy
|
4c4dbd0e17
|
Merge branch 'master' into master
|
2019-07-13 19:33:46 +01:00 |
|
Fermi
|
110f0cbb83
|
Fixes and making a message clearer so people don't think it's admins.
|
2019-07-13 19:17:19 +01:00 |
|
Poojawa
|
245bd3e650
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into last-word-hearing-psychics
|
2019-07-13 10:18:13 -05:00 |
|
Poojawa
|
4d895ae6c0
|
Gang victory news report and last words for discord bot
also slight improvement to gangster greetings
|
2019-07-13 08:38:19 -05:00 |
|
Ghommie
|
129ca9d71f
|
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-13 10:27:39 +02:00 |
|
Ghommie
|
71720f8a32
|
missed bits.
|
2019-07-13 07:12:37 +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 |
|
TrilbySpaceClone
|
b2345b19ce
|
critcal
|
2019-07-12 21:21:52 -04:00 |
|
Ghommie
|
b7c8909a18
|
Fixing a reagent ID typo.
|
2019-07-13 02:12:01 +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
|
57891813db
|
Merge pull request #8847 from Ghommie/Ghommie-cit123
Porting in two bar signs.
|
2019-07-12 07:36:29 -07:00 |
|
kevinz000
|
650842b384
|
Merge pull request #8854 from Ghommie/Ghommie-cit126
Stamina damage melee weaponry fixes.
|
2019-07-12 07:36:01 -07:00 |
|
kevinz000
|
e5d445c4d3
|
Merge pull request #8846 from Ghommie/Ghommie-cit122
Rubber toolboxes.
|
2019-07-12 07:35:25 -07:00 |
|
kevinz000
|
e26277b67c
|
Merge pull request #8872 from deathride58/lightermops
Janitors are no longer diabetic - nerfs mop stamina usage to be in-line with how much effort mopping takes IRL
|
2019-07-12 07:35:04 -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 |
|
kevinz000
|
bb568d633b
|
Merge pull request #8852 from Tupinambis/CursedPlush
Removes a plush representing the character of an underage player.
|
2019-07-12 07:32:29 -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 |
|
Sishen
|
befbcdabb0
|
Update mecha_control_console.dm
|
2019-07-11 23:11:45 -04:00 |
|
Tupinambis
|
cc901128c4
|
Oops I broke descriptions and sounds. Let me fix that.
|
2019-07-11 18:03:32 -05:00 |
|
deathride58
|
8d4c3b8ce9
|
Janitors are no longer diabetic - nerfs mop stamina usage to be more in-line with how much effort mopping takes IRL
|
2019-07-11 18:37:59 -04: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 |
|
kevinz000
|
c30a3aafb6
|
Update nanites.dm
|
2019-07-10 22:49:31 -07:00 |
|
kevinz000
|
239d688fe4
|
Update weapon.dm
|
2019-07-10 22:47:29 -07:00 |
|
kevinz000
|
db05432778
|
Update nanites.dm
|
2019-07-10 22:44:21 -07:00 |
|
Ghommie
|
143410c176
|
Blame Poojawa for the issue.
|
2019-07-11 07:39:29 +02:00 |
|
kevinz000
|
2995b22907
|
Update nanites.dm
|
2019-07-10 22:38:43 -07: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 |
|
kevinz000
|
05a01fe028
|
Update nanite_program_hub.dm
|
2019-07-10 22:11:16 -07:00 |
|
kevinz000
|
564904adf0
|
Merge pull request #8761 from Trilbyspaceclone/patch-187
[Ready] Tweaks shields
|
2019-07-10 22:02:19 -07:00 |
|
kevinz000
|
84d6fbe249
|
Update weapon.dm
|
2019-07-10 22:00:28 -07:00 |
|
Trilbyspaceclone
|
146276014c
|
Update other_reagents.dm
|
2019-07-10 20:42:12 -04:00 |
|
Poojawa
|
c4f736eb94
|
Merge branch 'master' into job-menu-improvements
|
2019-07-10 18:55:29 -05: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
|
5ea9d998fd
|
k_elasticity = 0
|
2019-07-10 18:32:55 -04:00 |
|
Trilbyspaceclone
|
baf4529e52
|
Update other_reagents.dm
|
2019-07-10 18:32:10 -04:00 |
|