Commit Graph

9386 Commits

Author SHA1 Message Date
kevinz000 91f114f717 Merge pull request #8832 from Ghommie/Ghommie-cit116
Fixes new player runtime that makes people unable to join rounds.
2019-07-07 02:33:32 -07:00
kevinz000 9d13576cc9 Merge pull request #8826 from Ghommie/Ghommie-cit111
Ports "Adds safer helper for alt-click turf listing"
2019-07-07 02:32:56 -07:00
kevinz000 6944725cfb Merge pull request #8824 from Ghommie/Ghommie-cit109
Ports "Fixes damp rag not smothering people"
2019-07-07 02:31:26 -07:00
kevinz000 f541357a2c Update utility.dm 2019-07-07 00:30:33 -07:00
Linzolle 1731d4a266 normalises hop and cap's berets to not hide hair 2019-07-07 01:44:58 -05:00
Fermi e84fc73bed Fixed buffers, SDGF, icons and spelling. 2019-07-07 05:59:21 +01:00
Ghommie 3404131f3a don't init yet. 2019-07-07 05:19:13 +02:00
Ghommie 696dd2839b clunky. 2019-07-07 05:13:14 +02:00
Ghommie b2192f0530 Fixes up space ninja's energy net. 2019-07-07 05:06:03 +02:00
Thalpy cc39c9f896 Merge branch 'master' into master 2019-07-06 16:03:17 +01:00
Ghommie fe2abc990b Fixes new player runtime that makes people unable to join rounds. 2019-07-06 04:51:56 +02:00
Ghommie 29dcfa1160 bluepilled. 2019-07-06 03:56:06 +02:00
Ghommie d14b18f89a I hate byond dmf editor what the $&@* 2019-07-06 03:17:20 +02:00
Ghommie 44390e00e4 ok 2019-07-06 02:03:21 +02:00
BurgerLua f4307f919b Nerfed changeling transformation string by making it temporary. 2019-07-05 16:49:02 -07:00
Ghommie 3ca31617aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit114 2019-07-05 23:06:57 +02:00
Ghommie 03315d1cbb Ports a toggleable darkmode to the game! 2019-07-05 22:29:50 +02:00
kevinz000 748550895d Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight
Ports traitor codeword highlighting
2019-07-05 06:57:49 -07:00
kevinz000 77743c9a0f Merge pull request #8794 from Ghommie/Ghommie-cit100
Fixes the uplink category indexing.
2019-07-05 06:56:22 -07:00
kevinz000 231e0170a9 Merge pull request #8663 from Ghommie/Ghommie-cit58
Peanuts, peanut butter, and PB&J sandwiches.
2019-07-05 06:55:49 -07:00
kevinz000 7544748570 Merge pull request #8790 from deathride58/pryablesleepers
Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers via crowbar
2019-07-05 06:55:18 -07:00
Fermi 7fa072030b Update to manage prefs. (and so it doesn't do it the wrong way round.) 2019-07-04 23:44:13 +01:00
Fermi a915821d1a Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-07-04 23:24:39 +01:00
Fermi ad37ec08b2 Removing slimejelly req from feedback. 2019-07-04 23:24:18 +01:00
Ghommie 3c2e03c247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58 2019-07-04 23:46:04 +02:00
Ghommie eed30d73a9 Ports "Makes ventcrawl much easier on the client" 2019-07-04 23:28:14 +02:00
Ghommie 5ff8be0faa Ports "Adds safer helper for alt-click turf listing" 2019-07-04 22:42:51 +02:00
Ghommie b41e289db3 Ports "Fixes default supplypods exploding their contents" & co. 2019-07-04 22:35:13 +02:00
Ghommie 37cf41a3bb Ports "Fixes damp rag not smothering people" 2019-07-04 22:06:16 +02:00
Ghommie b501edf9cf Ports "fixes spontaneous appendicitis picking incompatible biotypes" 2019-07-04 22:02:20 +02:00
Ghommie f134d58464 Flak. 2019-07-04 21:37:06 +02:00
Ghommie 0361a0a863 Ports "Updates corgi & parrot inventory panels to the same formatting as other mobs"
also "Makes Corgi collars removable"
2019-07-04 21:33:56 +02:00
Ghommie a2691e8f13 Ports "Add cancel button to assault pod destination selector" 2019-07-04 21:13:03 +02:00
Poojawa 899c5fed7e Oh this should be uncommented too. 2019-07-04 00:56:17 -05:00
Poojawa 43affcb831 properly fixes Quartermaster headrole, mind traits 2019-07-04 00:52:48 -05:00
Poojawa f66ee6f967 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-07-04 00:44:29 -05:00
Thalpy 8a6e669060 Merge branch 'master' into master 2019-07-04 03:14:29 +01:00
Sishen e5cd1bd7c2 Update thermomachine.dm 2019-07-03 17:46:05 -04:00
Sishen 4fa244e8e4 Update thermomachine.dm 2019-07-03 17:41:27 -04:00
Sishen 9e514bfab5 Update thermomachine.dm 2019-07-03 17:39:41 -04:00
Sishen df75f9f289 Update thermomachine.dm 2019-07-03 17:38:19 -04:00
Sishen a9f5b99510 Update thermomachine.dm 2019-07-03 16:55:14 -04:00
kevinz000 bce4ce31ab Merge pull request #8778 from Ghommie/Ghommie-cit97
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
2019-07-03 13:47:04 -07:00
kevinz000 75f1dca544 Merge pull request #8773 from Sishen1542/podgang
Podweak now have all customization options.
2019-07-03 13:46:08 -07:00
kevinz000 10a584c71f Merge pull request #8776 from Ghommie/Ghommie-cit96
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
2019-07-03 13:45:02 -07:00
kevinz000 ab217e81e6 Merge pull request #8781 from Sishen1542/plasteel
Adds plasteel to medical and security techfabs.
2019-07-03 13:42:22 -07:00
kevinz000 9654308a94 Merge pull request #8809 from Ghommie/Ghommie-cit103
Quickfixing latejoin ghost roles, I'm sorry.
2019-07-03 09:52:14 -07:00
kevinz000 948bba1274 Merge pull request #8799 from Trilbyspaceclone/Cargo_lewds
Adds Promiscuous Organs crate to cargo
2019-07-03 09:51:47 -07:00
kevinz000 0f0d5323a3 Merge pull request #8797 from Sishen1542/rotate-emitters
Emitters can be rotated instead of only flipped
2019-07-03 05:20:37 -07:00
kevinz000 8a4d7afca2 Update lungs.dm 2019-07-03 03:55:27 -07:00