Commit Graph
10126 Commits
Author SHA1 Message Date
FrozenGuy5andCitadelStationBot 9b4396f7b6 Tweaks hardsuit's armor ratings (#33428) 2017-12-10 17:45:41 -06:00
LetterJayandGitHub 85578cae0d Merge pull request #4316 from deathride58/iconoverridefix
Fixes icon_override only applying to uniforms
2017-12-10 17:15:13 -06:00
CitadelStationBot e578bce878 Automatic changelog generation for PR #4259 [ci skip] 2017-12-10 17:04:36 -06:00
deathride58andGitHub 0475ef46f7 Merge pull request #4259 from Citadel-Station-13/upstream-merge-33150
[MIRROR] Makes actionbuttons remember positions where you locked them.
2017-12-10 23:04:34 +00:00
deathride58andGitHub 01c9cf6479 Update preferences.dm 2017-12-10 17:45:21 -05:00
CitadelStationBot 97588f6f69 Automatic changelog generation for PR #4250 [ci skip] 2017-12-10 16:44:01 -06:00
deathride58andGitHub 216b0931d1 Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-10 22:43:58 +00:00
CitadelStationBot 6fd18b363c Automatic changelog generation for PR #4305 [ci skip] 2017-12-10 16:39:05 -06:00
deathride58andGitHub 94d0293703 Merge pull request #4305 from Citadel-Station-13/upstream-merge-33413
[MIRROR] Fix MULEbot ID numbers showing nowhere but the alt-click menu
2017-12-10 22:39:02 +00:00
deathride58andGitHub 2a481e69df Merge pull request #4307 from Citadel-Station-13/upstream-merge-33400
[MIRROR] Fix catch all blackbox vv guard
2017-12-10 22:36:09 +00:00
CitadelStationBot 1680b380a9 Automatic changelog generation for PR #4246 [ci skip] 2017-12-10 16:35:49 -06:00
deathride58andGitHub ee00ffc8db Merge pull request #4246 from Citadel-Station-13/upstream-merge-31727
[MIRROR] Brain Traumas
2017-12-10 22:35:47 +00:00
deathride58andGitHub fd3b0c72de Update say.dm 2017-12-10 17:01:50 -05:00
deathride58andGitHub a38ccf078b Update borer.dm 2017-12-10 16:59:46 -05:00
deathride58andGitHub 7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
deathride58andGitHub b66e664f11 Merge pull request #4309 from Citadel-Station-13/upstream-merge-33415
[MIRROR] Improves the way chem machines handle qdel, fixes some runtimes
2017-12-10 21:45:01 +00:00
deathride58andGitHub fa42a336f3 Merge pull request #4310 from Citadel-Station-13/upstream-merge-33320
[MIRROR] Fix runtimes using Tweak Component Ratings on non-machines
2017-12-10 21:44:34 +00:00
CitadelStationBot 81de010d71 Automatic changelog generation for PR #4306 [ci skip] 2017-12-10 15:44:01 -06:00
deathride58andGitHub 1a8dd315f9 Merge pull request #4306 from Citadel-Station-13/upstream-merge-33391
[MIRROR] Fixes butchered cats not dropping their ears and tails
2017-12-10 21:43:59 +00:00
deathride58andGitHub 215a8f47ed Merge pull request #4304 from Citadel-Station-13/upstream-merge-33423
[MIRROR] Undelaying roundend will now reboot the server normally.
2017-12-10 21:43:26 +00:00
CitadelStationBot 4dde93c027 Automatic changelog generation for PR #4308 [ci skip] 2017-12-10 15:43:00 -06:00
deathride58andGitHub 4b0137d62e Merge pull request #4308 from Citadel-Station-13/upstream-merge-33418
[MIRROR] Fixes booze-o-mats not having booze
2017-12-10 21:42:58 +00:00
CitadelStationBot e63179fb7e Automatic changelog generation for PR #4312 [ci skip] 2017-12-10 15:42:22 -06:00
deathride58andGitHub 57b6c893ff Merge pull request #4312 from Citadel-Station-13/upstream-merge-33279
[MIRROR] Standardizes false report weighting
2017-12-10 21:42:19 +00:00
CitadelStationBot 0a005d8b5c Automatic changelog generation for PR #4314 [ci skip] 2017-12-10 15:41:35 -06:00
deathride58andGitHub 93d780997f Merge pull request #4314 from Citadel-Station-13/upstream-merge-33414
[MIRROR] [READY]Fixes beam rifles and flightsuits
2017-12-10 21:41:33 +00:00
deathride58 85ccdac4d7 fixes icon_override only applying to uniforms 2017-12-10 16:37:28 -05:00
CitadelStationBot ffba092936 [READY]Fixes beam rifles and flightsuits 2017-12-10 15:19:18 -06:00
orangesandCitadelStationBot 30143ee601 Merge pull request #33414 from kevinz000/DAMNIT_DEATHRIDE_WHY_WHY_WHY_IM_SALTY_REEEEEEEEEEEEE
[READY]Fixes beam rifles and flightsuits
2017-12-10 15:19:18 -06:00
LetterJayandGitHub d82698d106 Merge pull request #4302 from Citadel-Station-13/upstream-merge-33280
[MIRROR] Add caltrop component for spikey floor objects
2017-12-10 14:20:40 -06:00
LetterJayandGitHub 336b02e2ba Merge pull request #4301 from Citadel-Station-13/upstream-merge-33396
[MIRROR] Fixes tooltip offsets
2017-12-10 14:20:32 -06:00
LetterJayandGitHub d1074cc29b Merge pull request #4300 from Citadel-Station-13/upstream-merge-33392
[MIRROR] [s]Ghost altclick fix for pet carriers
2017-12-10 14:20:23 -06:00
LetterJayandGitHub de13c6c799 Merge pull request #4293 from Citadel-Station-13/upstream-merge-33395
[MIRROR] switches lobes for grammar n shit
2017-12-10 14:20:02 -06:00
CitadelStationBot 2c2b120c3b Automatic changelog generation for PR #4287 [ci skip] 2017-12-10 14:19:53 -06:00
LetterJayandGitHub 563517ab4a Merge pull request #4287 from Citadel-Station-13/upstream-merge-33378
[MIRROR] Makes godwoken syndrome a bit more reliable
2017-12-10 14:19:51 -06:00
LetterJay aaeb9331f5 tgui recompile 2017-12-10 14:19:39 -06:00
CitadelStationBot 88958cedfe Standardizes false report weighting 2017-12-10 14:15:50 -06:00
orangesandCitadelStationBot 4dbac00348 Merge pull request #33279 from Robustin/Reported
Standardizes false report weighting
2017-12-10 14:15:50 -06:00
CitadelStationBot 188137de7f Fix runtimes using Tweak Component Ratings on non-machines 2017-12-10 14:08:21 -06:00
orangesandCitadelStationBot 38da8cb545 Merge pull request #33320 from AutomaticFrenzy/patch/component-ratings
Fix runtimes using Tweak Component Ratings on non-machines
2017-12-10 14:08:21 -06:00
CitadelStationBot db9d23ce21 Improves the way chem machines handle qdel, fixes some runtimes 2017-12-10 13:25:21 -06:00
ACCountandCitadelStationBot fd6a386779 Improves the way chem machines handle qdel, fixes some runtimes (#33415) 2017-12-10 13:25:21 -06:00
CitadelStationBot 31c2ffaa72 Fixes booze-o-mats not having booze 2017-12-10 13:20:06 -06:00
AnonmareandCitadelStationBot 52da86e214 Fixes booze-o-mats not having booze (#33418)
* Update vending.dm

* Update vending.dm

* Update vending_items.dm

* Adds a missing close parenthisis

* I'm drunk and blind, don't sue me

* Update vending_items.dm

* Update vending_items.dm
2017-12-10 13:20:06 -06:00
CitadelStationBot 981bc6558b Fix catch all blackbox vv guard 2017-12-10 13:03:40 -06:00
Jordan BrownandCitadelStationBot 309a936c5f Fix catch all blackbox vv guard (#33400) 2017-12-10 13:03:40 -06:00
CitadelStationBot 32f94272e6 Fixes butchered cats not dropping their ears and tails 2017-12-10 13:03:30 -06:00
jughuandCitadelStationBot d5472ab6e4 ha (#33391) 2017-12-10 13:03:30 -06:00
CitadelStationBot 96120dccfa Fix MULEbot ID numbers showing nowhere but the alt-click menu 2017-12-10 12:55:12 -06:00
Tad HardestyandCitadelStationBot 41b0dbe36f Fix MULEbot id numbers showing nowhere but the alt-click menu (#33413) 2017-12-10 12:55:12 -06:00