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 |
|
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 |
|
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 |
|
Ghom
|
26bbc64f16
|
Merge pull request #11136 from Owai-Seek/broomport-2-17-19
Ports Broom, Tweak Janitor Vendor
|
2020-02-20 11:48:06 +01:00 |
|
Ghom
|
d680ab9fd5
|
Merge pull request #11025 from Arturlang/TGUI_Next_Nanites
Ports TGUI Next and a lot of misc updates for nanites.
|
2020-02-20 11:27:48 +01:00 |
|
Ghom
|
32c001f264
|
Merge pull request #11140 from Citadel-Station-13/kevinz000-patch-15
buffs pai radio short 5 -> 3 minutes
|
2020-02-20 11:26:17 +01:00 |
|
Ghom
|
89f256866d
|
Merge pull request #11033 from kevinz000/cmo_drapes
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
|
2020-02-20 11:24:50 +01:00 |
|
Ghom
|
f94f997cc2
|
Merge pull request #11080 from kevinz000/surubatons
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
|
2020-02-20 11:09:46 +01:00 |
|
Ghom
|
7d8ae07fa0
|
Merge pull request #11139 from Citadel-Station-13/kevinz000-patch-12
projectiles now pierce through pAIs no matter what
|
2020-02-20 11:09:03 +01:00 |
|
Ghom
|
c1f8deb4a5
|
Merge pull request #11141 from Citadel-Station-13/kevinz000-patch-17
removes pai fulltile opacity
|
2020-02-20 11:08:27 +01:00 |
|
Ghom
|
e9d0f536de
|
Merge pull request #11146 from Putnam3145/supermatter-hardcap
Hardcaps supermatter damage from ballistics and similar
|
2020-02-20 11:08:14 +01:00 |
|
Ghom
|
1f42e9f451
|
Merge pull request #11149 from Putnam3145/fix-vendor-badcode
fixes mining vendors failing and eating your points iff you have exactly enough points
|
2020-02-20 11:07:51 +01:00 |
|
Ghom
|
22a041f72b
|
Merge pull request #11160 from Hatterhat/chem-combat-sucked-anyway
a mouth cover check for pies
|
2020-02-20 11:00:00 +01:00 |
|
kevinz000
|
d7403b3436
|
john doe
|
2020-02-19 22:26:10 -07:00 |
|
kevinz000
|
2dd5a0cfb8
|
Merge branch 'master' into hijack
|
2020-02-19 22:25:31 -07:00 |
|
kevinz000
|
a06fcea985
|
Merge remote-tracking branch 'citadel/master' into vampire_haste
|
2020-02-19 19:16:58 -07:00 |
|
kevinz000
|
6f31e1270e
|
Merge pull request #11098 from Trilbyspaceclone/bows!
Silk into clothing, bows, arrows, quivers and more!
|
2020-02-19 19:05:49 -07:00 |
|
kevinz000
|
49279086b7
|
Merge pull request #11113 from CameronWoof/biogeneratin'
Adds diethylamine and saltpetre to the biogenerator
|
2020-02-19 19:03:35 -07:00 |
|
kevinz000
|
9589c3116b
|
Merge pull request #11115 from Ghommie/Ghommie-cit583
Something more about runtime errors.
|
2020-02-19 19:03:01 -07:00 |
|
Hatterhat
|
9929cecec5
|
wack
|
2020-02-19 20:01:40 -06:00 |
|
kevinz000
|
8567346501
|
Merge pull request #10953 from Ghommie/Ghommie-cit564
The awesome adventures of the missing spurdo line replacement file.
|
2020-02-19 19:00:53 -07:00 |
|
kevinz000
|
6df64da7d6
|
Merge pull request #11133 from Citadel-Station-13/Ghommie-patch-2
Nerfs the fermenting barrel export industry & co.
|
2020-02-19 19:00:02 -07:00 |
|
kevinz000
|
1c2dca4a00
|
Merge pull request #11132 from Ghommie/Ghommie-cit585
Something about tesla revolvers and tk.
|
2020-02-19 18:59:44 -07:00 |
|
kevinz000
|
b983aa75ea
|
Merge pull request #11145 from Ghommie/Ghommie-cit586
Something about pAIs and silicon access priviledges.
|
2020-02-19 18:59:10 -07:00 |
|
Hatterhat
|
6b1a721f1c
|
literally a mouth cover check
|
2020-02-19 17:51:18 -06:00 |
|
Arturlang
|
901b54b7e8
|
Webedit man to the doom and rescue
|
2020-02-20 01:38:28 +02:00 |
|
Kraseo
|
cd56e29a98
|
drink my ass kevinz
|
2020-02-20 00:18:43 +01:00 |
|
Arturlang
|
796f51b557
|
Merge branch 'master' into TGUI_Next_Nanites
|
2020-02-20 00:52:55 +02:00 |
|
Putnam
|
3bf1ac590c
|
it's probably better that it works
|
2020-02-19 11:00:56 -08:00 |
|
Putnam
|
b76b346f2d
|
whoops
|
2020-02-19 10:56:43 -08:00 |
|
Putnam
|
395fb8de3e
|
Added licking pref.
|
2020-02-19 10:49:26 -08:00 |
|
Kraseo
|
f532c1a444
|
i spent 2 hours figuring out how to fix this
|
2020-02-19 18:40:30 +01:00 |
|
Unknown
|
c920d198e2
|
Update Viro to /tg/ standards
|
2020-02-19 12:17:57 -05:00 |
|
Ghommie
|
057b6f591c
|
HEEY
|
2020-02-19 14:23:12 +01:00 |
|
Ghommie
|
37ba75ec12
|
Fixing addiction moodlets not going away and secret sauce recipe paper.
|
2020-02-19 14:07:11 +01:00 |
|
Putnam
|
60f819465c
|
what. what. what. what. what.
|
2020-02-18 18:30:15 -08:00 |
|
Ghom
|
479cdccd17
|
Merge pull request #11138 from Citadel-Station-13/kevinz000-patch-11
The game's BUILT IN AUTOCLICKER no longer triggers the autoclicker detection system
|
2020-02-19 02:12:42 +01:00 |
|
Ghom
|
0619521418
|
Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4
Corrects a few cargo crates/exports (and nerfs some)
|
2020-02-19 02:10:25 +01:00 |
|
Ghom
|
4d39bae16b
|
Merge pull request #11103 from PersianXerxes/cargoTraitorObjectivesRDumb
Clarifies comments and locks defusal kits behind an emag
|
2020-02-19 02:09:02 +01:00 |
|
Ghom
|
77d5c09858
|
Merge pull request #11124 from Citadel-Station-13/kevinz000-patch-7
Bandaids a projectile runtime, removes an unused variable
|
2020-02-19 02:05:49 +01:00 |
|
Putnam
|
2834994587
|
why didn't we do this sooner
|
2020-02-18 11:34:09 -08:00 |
|
Ghom
|
08c86ec1ea
|
Merge pull request #11091 from BlueWildrose/master
Podpeople species tail wag fix; also lifebringer name fix
|
2020-02-18 17:11:50 +01:00 |
|
Ghom
|
6ea2843149
|
Merge pull request #11131 from Seris02/demondabbing
nerfs bloodcrawl to a cooldown of 0.6 seconds instead of no cooldown
|
2020-02-18 17:02:17 +01:00 |
|