Commit Graph

30712 Commits

Author SHA1 Message Date
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
CitadelStationBot
0cffb2e672 Automatic changelog generation for PR #11176 [ci skip] 2020-02-20 20:50:50 -06:00
Ghom
aceb76283f Merge pull request #11176 from Putnam3145/why-what
Fixing IRV again or: how I learned to start worrying and actually hate byond
2020-02-21 03:50:47 +01:00
Putnam
9f9881b57e this is so sad 2020-02-20 18:43:36 -08:00
CitadelStationBot
62ad68f1ef Automatic changelog generation for PR #11156 [ci skip] 2020-02-20 19:47:21 -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
CitadelStationBot
1f843e6c4b Automatic changelog generation for PR #11163 [ci skip] 2020-02-20 19:43:33 -06:00
Ghom
91cbc8fb3c Merge pull request #11163 from MrJWhit/update-to-teg-design
Quick TEG update
2020-02-21 02:43:30 +01:00
CitadelStationBot
f0599e2925 Automatic changelog generation for PR #10541 [ci skip] 2020-02-20 19:43:06 -06: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
Putnam
a49260e0ac Revert "maybe this'll work."
This reverts commit 8d00f11fc1.
2020-02-20 16:03:00 -08:00
Putnam
8d00f11fc1 maybe this'll work. 2020-02-20 16:01:06 -08:00
CitadelStationBot
a80a770310 Automatic changelog generation for PR #11155 [ci skip] 2020-02-20 16:50:11 -06:00
Lin
9999e15db9 Merge pull request #11155 from necromanceranne/cham_project_exploities
Cham projector no longer lets you become literally unclickable
2020-02-20 16:50:07 -06:00
CitadelStationBot
116d2b190d Automatic changelog generation for PR #11157 [ci skip] 2020-02-20 13:53:30 -06:00
Ghom
613158fe4e Merge pull request #11157 from Putnam3145/lick-pref
Lick pref
2020-02-20 20:53:27 +01:00
CitadelStationBot
505c93a68b Automatic changelog generation for PR #11154 [ci skip] 2020-02-20 13:52:32 -06: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
CitadelStationBot
0892837e5a Automatic changelog generation for PR #10572 [ci skip] 2020-02-20 08:33:30 -06: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
CitadelStationBot
ee07f1312e Automatic changelog generation for PR #11142 [ci skip] 2020-02-20 08:31:42 -06: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
CitadelStationBot
549e3d7fbd Automatic changelog generation for PR #10649 [ci skip] 2020-02-20 07:40:11 -06: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
CitadelStationBot
6ffde67b78 Automatic changelog generation for PR #11153 [ci skip] 2020-02-20 07:17:36 -06: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
CitadelStationBot
c5c29faf4b Automatic changelog generation for PR #11136 [ci skip] 2020-02-20 04:48:08 -06: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
CitadelStationBot
385cf77c6e Automatic changelog generation for PR #11025 [ci skip] 2020-02-20 04:27:51 -06: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
CitadelStationBot
6cb07e2c90 Automatic changelog generation for PR #11140 [ci skip] 2020-02-20 04:26:19 -06: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
CitadelStationBot
c39d51465e Automatic changelog generation for PR #11033 [ci skip] 2020-02-20 04:24:53 -06: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
CitadelStationBot
e36c5a10b3 Automatic changelog generation for PR #11166 [ci skip] 2020-02-20 04:14:17 -06:00
Ghom
8c7e760f18 Merge pull request #11166 from Putnam3145/why-what
Fixing IRV
2020-02-20 11:14:15 +01:00
CitadelStationBot
ca7e4de5d4 Automatic changelog generation for PR #11080 [ci skip] 2020-02-20 04:09:49 -06: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
CitadelStationBot
1b518b69c4 Automatic changelog generation for PR #11139 [ci skip] 2020-02-20 04:09:06 -06: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
CitadelStationBot
5f44230442 Automatic changelog generation for PR #11141 [ci skip] 2020-02-20 04:08:30 -06: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
CitadelStationBot
1cff36babd Automatic changelog generation for PR #11146 [ci skip] 2020-02-20 04:08:17 -06: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
CitadelStationBot
ad337901e2 Automatic changelog generation for PR #11149 [ci skip] 2020-02-20 04:07:54 -06: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
CitadelStationBot
296e845183 Automatic changelog generation for PR #11160 [ci skip] 2020-02-20 04:00:04 -06: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
CitadelStationBot
ca7e4842ee Automatic changelog generation for PR #11168 [ci skip] 2020-02-19 23:57:01 -06:00