Commit Graph
31638 Commits
Author SHA1 Message Date
kevinz000andGitHub bb1480a369 Update carbon.dm 2020-03-10 17:16:33 -07:00
CitadelStationBot e1a48cc91d Automatic changelog generation for PR #11411 [ci skip] 2020-03-10 19:14:53 -05:00
kevinz000andGitHub f5fd4733e1 Merge pull request #11411 from Citadel-Station-13/Ghommie-patch-1
Webedit touching the MOVESPEED_ID_DAMAGE_SLOWDOWN_FLYING speed modifier: Citadel Edition.
2020-03-10 17:14:51 -07:00
kevinz000andGitHub 31ed285a9e Merge pull request #11419 from Citadel-Station-13/Ghommie-patch-3-2
[s] Sanitizes ParseSong tempo.
2020-03-10 17:14:38 -07:00
GhomandGitHub 0d7612dcf5 [s] Sanitizes ParseSong tempo. 2020-03-11 00:29:31 +01:00
CitadelStationBot 6757eece5c Automatic changelog generation for PR #11401 [ci skip] 2020-03-10 18:03:32 -05:00
GhomandGitHub d55f7aba42 Merge pull request #11401 from Trilbyspaceclone/bow_sprites
Gives pipe and ashen bow inhand sprites
2020-03-11 00:03:29 +01:00
CitadelStationBot a834c0b184 Automatic changelog generation for PR #11417 [ci skip] 2020-03-10 16:52:32 -05:00
Putnam3145andGitHub 759b7a434f Merge pull request #11417 from Citadel-Station-13/Ghommie-patch-3
One liner fixing dynamic voting resulting in the unstartable gamemode.
2020-03-10 14:52:29 -07:00
GhomandGitHub 103dbe18b3 Update vote.dm 2020-03-10 22:24:27 +01:00
CitadelStationBot 3f707a61f2 Automatic changelog generation for PR #11349 [ci skip] 2020-03-10 12:01:55 -05:00
GhomandGitHub 48ff2f2cec Merge pull request #11349 from monster860/pixel_erp
Pixel shifting for ERP
2020-03-10 18:01:52 +01:00
aaf494c66b Update code/modules/mob/mob_defines.dm
Co-Authored-By: kevinz000 <2003111+kevinz000@users.noreply.github.com>
2020-03-10 17:37:39 +01:00
CitadelStationBot 4cc1fdadd4 Automatic changelog generation for PR #11399 [ci skip] 2020-03-10 10:59:58 -05:00
GhomandGitHub 424a3d9668 Merge pull request #11399 from Seris02/lizardtailfixes
normalising wagging tail names for a very specific bug fix
2020-03-10 16:59:55 +01:00
CitadelStationBot ef1fc6b6aa Automatic changelog generation for PR #11398 [ci skip] 2020-03-10 10:59:41 -05:00
GhomandGitHub abd2be036e Merge pull request #11398 from Citadel-Station-13/kevinz000-patch-7
fixes hands free actions (like !!!adrenal implants!!!) not being available during stuns
2020-03-10 16:59:38 +01:00
GhomandGitHub c86124f8ed Update human.dm 2020-03-10 14:34:17 +01:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub d3306e2eec Merge pull request #11392 from zeroisthebiggay/hardsuithelmetsarenice
syndicate elite hardsuit helmet doesnt hide masks anymore
2020-03-10 05:57:27 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
GhomandGitHub 80eaf3be0d Update _drone.dm 2020-03-09 22:22:38 +01:00
GhomandGitHub 0400fbf8a2 Update constructs.dm 2020-03-09 22:21:32 +01:00
8e030763b6 Odd but ok?
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-09 12:38:45 -04:00
CitadelStationBot d0a58ce9fa Automatic changelog generation for PR #11371 [ci skip] 2020-03-09 11:07:48 -05:00
GhomandGitHub 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
GhomandGitHub 503827a0b6 Merge pull request #11382 from zeroisthebiggay/snowflakesyndicatecontractorshit
tauric contractor space suits
2020-03-09 16:50:32 +01:00
GhomandGitHub 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
TrilbySpaceClone 4968c22b5f sprites! 2020-03-09 08:47:56 -04:00
Seris02 68382d65c8 normalising wagging tail names 2020-03-09 17:48:12 +08:00
CitadelStationBot 878947bf7e Automatic changelog generation for PR #11393 [ci skip] 2020-03-08 23:29:13 -05:00