Commit Graph

18469 Commits

Author SHA1 Message Date
Poojawa b00a76476c Oh hey, all of those compile fixes 2018-09-11 11:00:18 -05:00
Poojawa 834a94b97d some compile fixes 2018-09-11 09:23:20 -05:00
Poojawa fa70720cc1 Map Conversions 2018-09-11 08:58:34 -05:00
Poojawa afac3ae0ab Merge branch 'master' into changelog-memes 2018-09-11 07:52:59 -05:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
Poojawa 8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
Poojawa b6430559e9 datums 2018-09-11 02:49:41 -05:00
Poojawa 09512a6001 Controllers 2018-09-11 02:04:10 -05:00
Poojawa 07cb9572bd Onclick 2018-09-11 01:33:01 -05:00
Poojawa bb13e70d32 globalvars 2018-09-11 00:58:01 -05:00
Poojawa 0e510e8c34 HELPERS 2018-09-11 00:54:07 -05:00
Poojawa 49467dbd72 Defines 2018-09-11 00:45:50 -05:00
Poojawa 45b01a905d sound effect sorting 2018-09-11 00:20:37 -05:00
Poojawa dcb446727a Icon sync double checked for > 2mo last update 2018-09-11 00:03:21 -05:00
Poojawa dfcde0eb3c Merge remote-tracking branch 'refs/remotes/origin/master' into changelog-memes 2018-09-10 23:51:25 -05:00
deathride58 2b7af47717 Merge pull request #7557 from Trilbyspaceclone/patch-2
NPC Space Pirate Heath Buff 100 -> 115 (Yarr)
2018-09-10 18:56:34 -04:00
deathride58 705aa7d2e8 Merge pull request #7558 from GuppyLaxx/seamen
*jerks
2018-09-10 18:55:55 -04:00
deathride58 d04cfd8aa7 Merge pull request #7556 from Poojawa/patch-1
Adds intercoms to fetch module blacklist
2018-09-10 18:55:06 -04:00
deathride58 d36e683db3 Merge pull request #7547 from Citadel-Station-13/kevinz000-patch-5
fixes admin buildmode being unable to erase the heat of fusion reactions
2018-09-10 18:53:58 -04:00
deathride58 997cb75f8f Merge pull request #7542 from Citadel-Station-13/kevinz000-patch-2
adds prescription nvgs
2018-09-10 18:51:05 -04:00
deathride58 bafac93084 Merge pull request #7538 from Trilbyspaceclone/patch-22
Makes a new blue space node, Bluespace Pockets!(Nerfing sci)
2018-09-10 18:50:45 -04:00
deathride58 70f979fa95 Merge pull request #7534 from nik707/stealthnerfs
[s] nerfs smuggler satchels cus wtf
2018-09-10 18:50:22 -04:00
Poojawa 7a8c76d9cb Update dogborg_equipment.dm 2018-09-08 20:07:44 -05:00
guppylaxx dedb703d0a fuck2 2018-09-07 16:21:12 -04:00
guppylaxx 9c820743d5 fuck 2018-09-07 16:18:40 -04:00
Trilbyspaceclone 988d5fd558 NPC Space Pirate Heath Buff 100 -> 115
For the away mission
2018-09-07 16:05:51 -04:00
Poojawa 3838a4bd95 Adds intercoms to fetch module blacklist
smh, should probably be an anchored check as well, but who the fuck knows how to make that work with component memes
2018-09-07 13:40:06 -05:00
CitadelStationBot 9246537b1f Automatic changelog generation for PR #7504 [ci skip] 2018-09-07 09:26:31 -05:00
deathride58 b89203acc7 reduces stam buffer regen time to 1 second (#7504) 2018-09-07 07:26:29 -07:00
CitadelStationBot 6fc3df1c91 Automatic changelog generation for PR #7541 [ci skip] 2018-09-07 09:25:44 -05:00
deathride58 7650bac441 Upstream bugfix mirror spree (#7541)
* tgstation/tgstation#40061 - Fixes mobs getting stuck at min/max body temperature

* tgstation/tgstation#40043 - fixes beam rifles opening lockers

* tgstation/tgstation#40041 - Pictures of asses are properly sized now

* tgstation/tgstation#40084 - fixes lastattacker not including unarmed attacks

* tgstation/tgstation#39968 - Fixes plastic golems ventcrawling with items in pockets

* tgstation/tgstation#39885 - Fix overcharging energy guns crashing the server
2018-09-07 07:25:42 -07:00
CitadelStationBot c0389e4fff Automatic changelog generation for PR #7549 [ci skip] 2018-09-07 09:24:41 -05:00
deathride58 b34b53193f tgstation/tgstation#39287 - Makes rapid fire mobs more configurable (#7549) 2018-09-07 07:24:39 -07:00
CitadelStationBot 07a5b8fda2 Automatic changelog generation for PR #7555 [ci skip] 2018-09-07 09:22:46 -05:00
deathride58 1bc8b3530c Adds spawn text when spawning in as a miner. (#7555)
* adds spawn text when spawning in as a miner

* fixes compiling error
2018-09-07 07:22:44 -07:00
Poojawa 2066111026 Fixes an <i> noticed in Musician.dm (#7548) 2018-09-07 05:43:00 -07:00
CitadelStationBot 813a077e3f Automatic changelog generation for PR #7424 [ci skip] 2018-09-07 07:40:54 -05:00
deathride58 b604390f33 Ports tgstation/tgstation#39302 with adjustments, see desc of commit (#7424)
Instead of the box being 100% invisible at all times, the box will steadily become more and more visible as you move. The faster you move, the more visible the box becomes. The box will slowly become invisible again every process() cycle.
This also makes the box inherit the movement delay of it's user, meaning you're able to sprint while moving inside boxes, or walk to slow yourself down.
2018-09-07 05:40:53 -07:00
CitadelStationBot 5368b36397 Automatic changelog generation for PR #7508 [ci skip] 2018-09-07 07:40:37 -05:00
deathride58 6fa011c1be INTRODUCING KITCHEN GUN (#7508) 2018-09-07 05:40:35 -07:00
CitadelStationBot 7f9df0de93 Automatic changelog generation for PR #7509 [ci skip] 2018-09-07 07:23:44 -05:00
deathride58 55db128199 [EXPERIMENTAL] Let's give active turf processing it's own bloody subsystem. With blackjack! And hookers! (#7509)
* HOW ABOUT WE TAKE THE AIR PROCESSING

AND MOVE IT OVER THERE!!!!

* makes gas reactions happen in the original atmos subsystem so gas reactions run at the original atmos speed
2018-09-07 05:23:42 -07:00
deathride58 6cc7c3cd6b Merge pull request #7533 from Citadel-Station-13/fusion_2
Ports new fusion from /tg/station. Now with extra FUN*! *lethality, lightning, radioactive fallout, and explosions
2018-09-06 14:28:15 -04:00
deathride58 45d0afb957 Merge pull request #7522 from nik707/armorynerfs
Nerfs the starting armory
2018-09-06 14:19:33 -04:00
deathride58 f2978d542e Merge pull request #7532 from Trilbyspaceclone/patch-20
Fixing placement and nerfing of Adv Illegal node
2018-09-06 13:33:48 -04:00
deathride58 b5566353cf Merge pull request #7531 from nik707/fuckingdronesman
clarifies drone rules when becoming a drone
2018-09-06 13:33:36 -04:00
deathride58 d080154423 Merge pull request #7529 from Trilbyspaceclone/patch-19
Makes slime cores be able to be made into sci points (Once per color type)
2018-09-06 13:33:22 -04:00
CitadelStationBot df1018949d Automatic changelog generation for PR #7516 [ci skip] 2018-09-06 12:31:40 -05:00
deathride58 bb359e78d4 Merge pull request #7516 from izzyinbox/electrostim-circuit-part
Adds electro-stimulation integrated circuit part
2018-09-06 13:31:38 -04:00
kevinz000 4f1e6603cc Update helpers.dm 2018-09-06 05:35:43 -07:00