Commit Graph

15559 Commits

Author SHA1 Message Date
pigeons 7a07c101df AI requires silicon exp instead of crew exp for roundstart role (#36469)
* Ai requires silicon xp

* Reverses byond age change
2018-04-11 04:54:32 -05:00
deathride58 4063781baf Merge pull request #6332 from Citadel-Station-13/upstream-merge-37040
[MIRROR] Fixes Acute Respiratory Distress Syndrome not having a treshhold description
2018-04-11 01:04:16 +00:00
deathride58 acc6919083 Merge pull request #6333 from Citadel-Station-13/upstream-merge-37051
[MIRROR] Delta arrivals shuttle fixes
2018-04-11 01:03:50 +00:00
deathride58 d6c2e4dd56 Merge pull request #6336 from Citadel-Station-13/upstream-merge-37050
[MIRROR] Fix fullscreens added to clientless mobs not stretching properly
2018-04-11 01:03:23 +00:00
deathride58 4b87170139 Adds "Man up" verb for admins. (#6296)
* adds man up verb

* Update admin_verbs.dm

* adds man up global

* blech
2018-04-10 17:34:45 -07:00
CitadelStationBot 94f024dc6c Fix fullscreens added to clientless mobs not stretching properly 2018-04-10 19:23:28 -05:00
Jordan Brown 0a9ca8b073 Merge pull request #37050 from AutomaticFrenzy/patch/fullscreen-cloning
Fix fullscreens added to clientless mobs not stretching properly
2018-04-10 19:23:28 -05:00
oranges 4b34949340 Merge pull request #37071 from kevinz000/patch-480
Fixes constants chips getting scrambled by EMPs
2018-04-10 16:22:49 -07:00
CitadelStationBot 3e2b96f63e Delta arrivals shuttle fixes 2018-04-10 17:02:35 -05:00
81Denton 50e139871c FUCKING COMPILE (#37051) 2018-04-10 17:02:35 -05:00
CitadelStationBot 005f185301 Fixes Acute Respiratory Distress Syndrome not having a treshhold description 2018-04-10 16:03:23 -05:00
Alomga 042fa8c5ff Update choking.dm (#37040) 2018-04-10 16:03:22 -05:00
LetterJay 33d6ee9f96 Update __donator.dm 2018-04-10 11:54:50 -05:00
LetterJay e3f10e444d Merge pull request #6331 from Michiyamenotehifunana/polychrome-for-donators
Preliminary Implementation of Polychromatic Donator stuff
2018-04-10 11:52:35 -05:00
Michiyamenotehifunana 4c86571f9a Preliminary polish and implementation of exclusive polychromics 2018-04-10 22:56:16 +08:00
deathride58 f33d77a073 Merge pull request #6323 from Citadel-Station-13/upstream-merge-37065
[MIRROR] Fixes escape pods not getting to their default destination
2018-04-10 07:47:00 +00:00
deathride58 9647de2806 Merge pull request #6328 from Citadel-Station-13/upstream-merge-36788
[MIRROR] Fixed paperbin dropping and fingerprints
2018-04-10 07:20:33 +00:00
deathride58 96191b8b6a Update emergency.dm 2018-04-10 03:15:27 -04:00
LetterJay 7f2c0b9a82 Merge pull request #6303 from Citadel-Station-13/synctesting
[READY FOR REVIEW/TESTMERGE] TG sync
2018-04-09 17:52:49 -05:00
deathride58 e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
LetterJay dab96582bd Merge pull request #6306 from Citadel-Station-13/upstream-merge-37002
[MIRROR] Fixes slime latching
2018-04-09 16:40:14 -05:00
LetterJay d1067b4271 Merge pull request #6329 from Citadel-Station-13/upstream-merge-36571
[MIRROR] Mark appearance_flags and sight as bitflags for VV
2018-04-09 16:39:59 -05:00
LetterJay 7d93dec924 Merge pull request #6327 from Citadel-Station-13/upstream-merge-36915
[MIRROR] Detective Scanner Fixes
2018-04-09 16:39:46 -05:00
LetterJay 80e0be6d1e Merge pull request #6326 from Citadel-Station-13/upstream-merge-37072
[MIRROR] Fix an error message grammer
2018-04-09 16:39:28 -05:00
LetterJay c2ff35d28f Merge pull request #6325 from Citadel-Station-13/upstream-merge-37063
[MIRROR] Fixes swarming runtime
2018-04-09 16:39:10 -05:00
LetterJay 859cf53869 Merge pull request #6324 from Citadel-Station-13/upstream-merge-37059
[MIRROR] Makes spacemove check location.
2018-04-09 16:38:57 -05:00
LetterJay 8433e7b154 Merge pull request #6322 from Citadel-Station-13/upstream-merge-37042
[MIRROR] Fixes underlying area grabbing subtypes
2018-04-09 16:38:32 -05:00
LetterJay ba03df8c86 Merge pull request #6321 from Citadel-Station-13/upstream-merge-37053
[MIRROR] Fixes overflow role latejoin
2018-04-09 16:38:14 -05:00
LetterJay 60a72311a7 Merge pull request #6320 from Citadel-Station-13/upstream-merge-37036
[MIRROR] Fixes an heirloom trait-related runtime that gets spammed in the logs
2018-04-09 16:37:54 -05:00
LetterJay 6e89bdb737 Merge pull request #6316 from Citadel-Station-13/upstream-merge-37017
[MIRROR] Adds an are you sure dialog when pressing delete note.
2018-04-09 16:36:53 -05:00
LetterJay 954f1b0655 Merge pull request #6315 from Citadel-Station-13/kevinz000-patch-3
>wiped my flavortext accidently
2018-04-09 16:36:27 -05:00
LetterJay 294f1fdf45 Merge pull request #6314 from Citadel-Station-13/upstream-merge-37004
[MIRROR] Adds new drink sprites for Stinger, Grasshopper, and Quadruple/Quintuple Sec by Mickyan
2018-04-09 16:35:58 -05:00
LetterJay a1f70e87d5 Merge pull request #6313 from Citadel-Station-13/upstream-merge-37033
[MIRROR] Makes revheads always show on top of the check antags listing.
2018-04-09 16:35:43 -05:00
LetterJay 674ab59397 Merge pull request #6312 from Citadel-Station-13/upstream-merge-37038
[MIRROR] Fixes a very common runtime involving incorrect proc signature on MakeSlippery overrides
2018-04-09 16:35:28 -05:00
LetterJay 944b74b95c Merge pull request #6311 from Citadel-Station-13/upstream-merge-36991
[MIRROR] Wrench Supermatter Shard to the ground
2018-04-09 16:35:10 -05:00
LetterJay 5e7c47c9eb Merge pull request #6310 from Citadel-Station-13/upstream-merge-36430
[MIRROR] Bird and Chasm phobias
2018-04-09 16:34:46 -05:00
Tad Hardesty 126c610ccd Mark appearance_flags and sight as bitflags for VV 2018-04-09 14:15:24 -05:00
CitadelStationBot e328c08587 Fixed paperbin dropping and fingerprints 2018-04-09 14:14:13 -05:00
Davidj361 075a879343 Fixed paperbin dropping and fingerprints (#36788)
* Removed parent call to stop the paperbin from dropping from being carried when getting a pen or paper.

* Found a better fix

* Better operator

* Fixed fingerprints not being created upon paper bin interaction

* Review change
2018-04-09 14:14:13 -05:00
CitadelStationBot 0a0caf9b91 Detective Scanner Fixes 2018-04-09 13:05:30 -05:00
Davidj361 a25b8ec1be Detective Scanner Fixes (#36915)
* Fixed notes for detective's printed report

* Added alt-click functionality to clear logs for detective scanner

* Added a right click option to detective scanner to display logs without printing them

* Made the display function as an action button.

* Review changes done

* review changes

* review changes and a bad player message fix
2018-04-09 13:05:30 -05:00
CitadelStationBot 8e3bdaf432 Fix an error message grammer 2018-04-09 12:48:58 -05:00
Jordan Brown f2717989c9 Fix an error message grammer 2018-04-09 12:48:58 -05:00
AnturK bdf2f65a8f Fixes swarming runtime 2018-04-09 11:06:28 -05:00
CitadelStationBot 41bca1cd3c Makes spacemove check location. 2018-04-09 11:06:17 -05:00
AnturK daeca4892e Makes spacemove check location. 2018-04-09 11:06:17 -05:00
Emmett Gaines fd8a80d6cb Fixes escape pods not getting to their default destination 2018-04-09 05:24:55 -05:00
CitadelStationBot 7ad9babb25 Fixes underlying area grabbing subtypes 2018-04-09 05:22:42 -05:00
vuonojenmustaturska 0372a042ad Merge pull request #37042 from ninjanomnom/just-the-area-I-needed
Fixes underlying area grabbing subtypes
2018-04-09 05:22:42 -05:00
CitadelStationBot 74c66dfa79 Fixes overflow role latejoin 2018-04-09 05:10:15 -05:00