Commit Graph

31613 Commits

Author SHA1 Message Date
kevinz000 3d6c82cbc8 Merge pull request #11381 from Citadel-Station-13/Ghommie-patch-2
Something about layers.
2020-03-10 05:59:36 -07:00
CitadelStationBot 5d475b4537 Automatic changelog generation for PR #11388 [ci skip] 2020-03-10 07:59:27 -05:00
kevinz000 832d894e92 Merge pull request #11388 from Owai-Seek/crabby-patty-3/1/20
Food Ports / Butter Bear / Food Craft Speed
2020-03-10 05:59:24 -07:00
CitadelStationBot d837476389 Automatic changelog generation for PR #11390 [ci skip] 2020-03-10 07:58:46 -05:00
kevinz000 41fdaae32c Merge pull request #11390 from zeroisthebiggay/ghosthudstaketwo
makes ghost hud default to on and ghost darkness defaults to on
2020-03-10 05:58:43 -07:00
kevinz000 e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00
CitadelStationBot 40e470cba2 Automatic changelog generation for PR #11392 [ci skip] 2020-03-10 07:57:29 -05:00
kevinz000 d3306e2eec Merge pull request #11392 from zeroisthebiggay/hardsuithelmetsarenice
syndicate elite hardsuit helmet doesnt hide masks anymore
2020-03-10 05:57:27 -07:00
kevinz000 3eac86cf31 Merge pull request #11394 from Citadel-Station-13/Ghommie-patch-3
Actually fixing that one overlay.
2020-03-10 05:57:18 -07:00
CitadelStationBot 04c5a5a83b Automatic changelog generation for PR #11395 [ci skip] 2020-03-10 07:56:59 -05:00
kevinz000 1b7eaf48eb Merge pull request #11395 from Citadel-Station-13/Ghommie-patch-4
Shuttle timer display seconds fix
2020-03-10 05:56:56 -07:00
kevinz000 bfb75eb26b Merge pull request #11396 from Ghommie/Ghommie-cit613
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-10 05:56:28 -07:00
CitadelStationBot 040c84b55f Automatic changelog generation for PR #11397 [ci skip] 2020-03-10 07:56:10 -05:00
kevinz000 aca1d70bbb Merge pull request #11397 from zeroisthebiggay/helmetsarenotheavy
syndicate contractor helmets are no longer secretly lead
2020-03-10 05:56:08 -07:00
Winter Flare 8a452b7f09 Food Craft Speed 2020-03-10 01:43:18 -04:00
Winter Flare eaab44735b Fix Fiesta Skewer
Fiesta Skewer icon was missing.
2020-03-10 01:01:23 -04:00
Winter Flare 9ec222e5b4 Empowered Burger 2020-03-10 00:53:42 -04:00
kevinz000 bd2aa5f54b Merge pull request #11402 from Ghommie/Ghommie-cit614
Porting more legcuffs / bola fixes etcetera
2020-03-09 21:01:51 -07:00
CitadelStationBot d9a0d610c0 Automatic changelog generation for PR #11403 [ci skip] 2020-03-09 21:28:05 -05:00
kevinz000 f444020741 Merge pull request #11403 from Citadel-Station-13/Ghommie-patch-1
[s] Ports "Fixes gibber part update"
2020-03-09 19:28:02 -07:00
Ghom 80eaf3be0d Update _drone.dm 2020-03-09 22:22:38 +01:00
Ghom 0400fbf8a2 Update constructs.dm 2020-03-09 22:21:32 +01:00
CitadelStationBot d0a58ce9fa Automatic changelog generation for PR #11371 [ci skip] 2020-03-09 11:07:48 -05:00
Ghom 29346f7827 Merge pull request #11371 from keronshb/BlobRefactor
Blob refactor + reroll ports
2020-03-09 17:07:45 +01:00
CitadelStationBot 126d80e1de Automatic changelog generation for PR #11382 [ci skip] 2020-03-09 10:50:36 -05:00
Ghom 503827a0b6 Merge pull request #11382 from zeroisthebiggay/snowflakesyndicatecontractorshit
tauric contractor space suits
2020-03-09 16:50:32 +01:00
Ghom ea556e6357 [s] Ports "Fixes gibber part update" 2020-03-09 16:41:56 +01:00
Ghommie 4143c1963c Porting more legcuffs / bola fixes etcetera 2020-03-09 16:20:51 +01:00
CitadelStationBot 878947bf7e Automatic changelog generation for PR #11393 [ci skip] 2020-03-08 23:29:13 -05:00
kevinz000 3da09077ec Merge pull request #11393 from Citadel-Station-13/Ghommie-patch-1
Webedit fixing bloodsucker mesmerize
2020-03-08 21:29:10 -07:00
ZeroMan c079dba753 its a fucking helmet 2020-03-08 23:07:24 -04:00
Ghommie ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
keronshb 7e1e905a95 Line ending changes, I hope
here goes nothing.
2020-03-08 20:36:05 -04:00
Ghom f1d6360b70 Shuttle timer display seconds fix 2020-03-09 01:31:39 +01:00
keronshb 0d3da4fcc0 maybe? last go? 2
Should be the final part I hope
2020-03-08 20:11:13 -04:00
keronshb 94958581b9 maybe? last go?
maybe? last go?
2020-03-08 20:10:34 -04:00
Ghom f8c18fe5a8 Update PDA.dm 2020-03-09 00:52:11 +01:00
keronshb fd1dc991ce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor
Pne more test go
2020-03-08 19:48:30 -04:00
CitadelStationBot 0d66a40e55 Automatic changelog generation for PR #11377 [ci skip] 2020-03-08 18:26:56 -05:00
Ghom 1c5aa2f933 Merge pull request #11377 from Kraseo/contractor-fixes
Some contractor adjustments & fixes
2020-03-09 00:26:54 +01:00
CitadelStationBot c063558c6e Automatic changelog generation for PR #11317 [ci skip] 2020-03-08 18:26:08 -05:00
Ghom 8878733fc1 Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI
Ports Skyrat's synths (Plus limb rendering overhaul and more)
2020-03-09 00:26:06 +01:00
keronshb 7955ca4f8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor
Trying to fix this shit again
2020-03-08 19:17:28 -04:00
CitadelStationBot aa25547ce3 Automatic changelog generation for PR #11288 [ci skip] 2020-03-08 18:01:14 -05:00
Ghom 1cd9c19b4c Merge pull request #11288 from Trilbyspaceclone/patch-300
[ready] Craftable Prescription & Sunglasses HUDs
2020-03-09 00:01:12 +01:00
keronshb d460f5359e Hopefully this will fix it?
Hopefully this will fix it?
2020-03-08 18:49:18 -04:00
keronshb 9b63c7aa11 Trying to see if this will fix the line end issue
Trying to see if this will fix the line end issue
2020-03-08 18:48:42 -04:00
Ghom bceed5d002 Update recipes_clothing.dm 2020-03-08 23:46:33 +01:00
Ghom 187de6869f Webedit fixing bloodsucker mesmerize 2020-03-08 23:38:30 +01:00
ZeroMan 388891bde3 fianlly ive discovered obanium 2020-03-08 18:31:12 -04:00