Commit Graph

9837 Commits

Author SHA1 Message Date
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
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
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
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
Tad Hardesty 126c610ccd Mark appearance_flags and sight as bitflags for VV 2018-04-09 14:15:24 -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
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
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
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
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
KorPhaeron 46b7b95897 Finishes overflow roles (#37053) 2018-04-09 05:10:14 -05:00
vuonojenmustaturska 2c275be1c1 Fixes an heirloom trait-related runtime that gets spammed in the logs (#37036)
* honk

* return

* Update negative.dm

* Update _trait.dm
2018-04-09 04:52:40 -05:00
Dax Dupont 37b8772f1c Adds an are you sure dialog when pressing delete note. (#37017)
* Adds an are you sure dialog when pressing delete note.

* The true is out there
2018-04-08 23:40:36 -05:00
kevinz000 cd38bccf01 why 2018-04-08 19:40:28 -07:00
Ashe Higgs 682db30746 Adds new drink sprites for Stinger, Grasshopper, and Quadruple/Quintuple Sec by Mickyan 2018-04-08 19:26:38 -05:00
AnturK a3f873e4b2 Makes revheads always show on top of the check antags listing. (#37033) 2018-04-08 19:23:24 -05:00
vuonojenmustaturska d0075b37b3 Fixes a turf runtime (#37038) 2018-04-08 19:22:14 -05:00
deathride58 d3ba1085bb you've gotta be kidding 2018-04-08 18:54:16 -04:00
Spirono 29fcf2d5aa Wrench Supermatter Shard to the ground (#36991)
* Temporary concept code for PR

I doubt this code is the standard method of doing things, but trying to understand this code is a bit AIDS

* Using wrench_act() and default_unfasten_wrench() instead

It actually works this time
2018-04-08 16:59:25 -05:00
CosmicScientist 5d1b06c2e3 Bird and Chasm phobias (#36430)
CosmicScientist

add: Top Nanotrasen scientists have diagnosed two new phobias! Birds and chasms! Good luck Chief Engineers and Miners.


Modified fear of doctors to include plague doctor suit. Who isn't afraid of Medieval medicine?
2018-04-08 16:24:34 -05:00
AnturK 73efe7245c Fixes slime latching (#37002) 2018-04-08 04:59:02 -05:00
deathride58 120457d8fd Merge pull request #6088 from Citadel-Station-13/FixesItAll
Makes sure the server can never ever crash ever again
2018-04-08 04:18:37 +00:00
deathride58 ed2de4a61e Merge pull request #6115 from Poojawa/metabreaking
Metabreaks event reports
2018-04-08 04:17:35 +00:00
deathride58 5f81921fa6 Merge branch 'master' into synctesting 2018-04-08 03:41:50 +00:00
deathride58 87365ee74b getStaminaLoss() 2018-04-07 23:39:48 -04:00
CitadelStationBot 43baad50f1 [MIRROR] Add on-map sprites for pre-enabled atmos pumps (#6300)
* Add on-map sprites for pre-enabled atmos pumps

* Update volume_pump.dm

* Update pump.dm
2018-04-07 22:38:32 -05:00
Poojawa a491e364c3 Adjust permissions for Admin Observers (#6247)
* adjusts permissions for the new political officer

* Update admin_verbs.dm

* adds +ADMIN checks to ahelp replies

* Update admin_verbs.dm
2018-04-07 22:33:42 -05:00
Poojawa 5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
deathride58 832939d3ac Merge pull request #6282 from Citadel-Station-13/upstream-merge-36989
[MIRROR] Logs the load away mission verb.
2018-04-08 02:25:25 +00:00