Commit Graph
9959 Commits
Author SHA1 Message Date
KorPhaeronandCitadelStationBot 46b7b95897 Finishes overflow roles (#37053) 2018-04-09 05:10:14 -05:00
vuonojenmustaturskaandCitadelStationBot 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 DupontandCitadelStationBot 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
kevinz000andGitHub cd38bccf01 why 2018-04-08 19:40:28 -07:00
Ashe HiggsandCitadelStationBot 682db30746 Adds new drink sprites for Stinger, Grasshopper, and Quadruple/Quintuple Sec by Mickyan 2018-04-08 19:26:38 -05:00
AnturKandCitadelStationBot a3f873e4b2 Makes revheads always show on top of the check antags listing. (#37033) 2018-04-08 19:23:24 -05:00
vuonojenmustaturskaandCitadelStationBot d0075b37b3 Fixes a turf runtime (#37038) 2018-04-08 19:22:14 -05:00
deathride58andGitHub d3ba1085bb you've gotta be kidding 2018-04-08 18:54:16 -04:00
SpironoandCitadelStationBot 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
CosmicScientistandCitadelStationBot 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
Dax DupontandCitadelStationBot 8a13dad21c Minor VR sleeper related changes 2018-04-08 05:03:18 -05:00
AnturKandCitadelStationBot 73efe7245c Fixes slime latching (#37002) 2018-04-08 04:59:02 -05:00
deathride58andGitHub 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
deathride58andGitHub ed2de4a61e Merge pull request #6115 from Poojawa/metabreaking
Metabreaks event reports
2018-04-08 04:17:35 +00:00
deathride58andGitHub 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
CitadelStationBotandPoojawa 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
PoojawaandGitHub 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
Poojawaanddeathride58 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
deathride58andGitHub 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
deathride58andGitHub 1d1c0a5ebb Merge pull request #6284 from Citadel-Station-13/upstream-merge-36560
[MIRROR] [READY]AI latejoins
2018-04-08 02:25:10 +00:00
deathride58andGitHub cf134192cc Merge pull request #6302 from Citadel-Station-13/upstream-merge-36871
[MIRROR] Shuttle garbage collection
2018-04-08 02:24:54 +00:00
deathride58andGitHub c4c7ac7a3e Merge pull request #6301 from Citadel-Station-13/upstream-merge-36980
[MIRROR] Prevents direct Del() calls
2018-04-08 02:24:37 +00:00
kevinz000andCitadelStationBot e8561ec98c Shuttle garbage collection (#36871)
* Shuttle garbage collection

* istype
2018-04-07 19:50:27 -05:00
vuonojenmustaturskaandCitadelStationBot 6ed0eee3f6 Merge pull request #36980 from tgstation/Cyberboss-patch-1
Prevents direct Del() calls
2018-04-07 19:47:13 -05:00
AnturKandCitadelStationBot 3de992aee2 Fixes cow tipping properly (#37015) 2018-04-07 18:15:00 -05:00
deathride58andGitHub a3f9995f0f Merge pull request #6280 from Citadel-Station-13/upstream-merge-36976
[MIRROR] fixes cows moving while tipped
2018-04-07 00:54:52 +00:00
deathride58andGitHub 71344ce953 Merge pull request #6281 from Citadel-Station-13/upstream-merge-36975
[MIRROR] Removes a sound
2018-04-07 00:54:31 +00:00
deathride58andGitHub 57f0cc35b5 Update mapping.dm 2018-04-06 20:54:12 -04:00
deathride58andGitHub b88da782aa Update job.dm 2018-04-06 20:53:15 -04:00
deathride58andGitHub e54029a382 Update stack.dm 2018-04-06 20:51:39 -04:00
deathride58andGitHub 4739836bd9 Merge pull request #6283 from Citadel-Station-13/upstream-merge-36994
[MIRROR] Fixes window spawner names
2018-04-07 00:51:12 +00:00
deathride58andGitHub b53b81455a Merge pull request #6285 from Citadel-Station-13/upstream-merge-36961
[MIRROR] Fixes mixed blood samples to preserve cloneable if the samples are the same
2018-04-07 00:50:56 +00:00
deathride58andGitHub d79d4ae3f1 Merge pull request #6286 from Citadel-Station-13/upstream-merge-36973
[MIRROR] Fixes null reference not pulsing the 'not scanned' output
2018-04-07 00:50:40 +00:00
deathride58andGitHub 863ca69d3f Merge pull request #6288 from Citadel-Station-13/upstream-merge-36920
[MIRROR] READY flash fixes
2018-04-07 00:50:23 +00:00
deathride58andGitHub 36c9094155 Merge pull request #6289 from Citadel-Station-13/upstream-merge-36956
[MIRROR] Fixes trash bin wrenching message
2018-04-07 00:49:53 +00:00
deathride58andGitHub bae5e5c81d Merge pull request #6291 from Citadel-Station-13/upstream-merge-36997
[MIRROR] Fixes dead chat announcements not using real name.
2018-04-07 00:49:33 +00:00
deathride58andGitHub df879ce1ca Merge pull request #6292 from Citadel-Station-13/upstream-merge-36872
[MIRROR] GC debugging features
2018-04-07 00:48:47 +00:00
deathride58andGitHub 475fba9bd9 Merge pull request #6294 from Citadel-Station-13/upstream-merge-36627
[MIRROR]  fixes #34388 by adding cam
2018-04-07 00:46:51 +00:00
AnturKandCitadelStationBot 45a8c65739 Adds kickback to mecha weapons. (#36999) 2018-04-06 14:43:11 -05:00
TlaltecuhtliandCitadelStationBot 4f7d35ec4f fixes #34388 by adding cam (#36627)
* wip fixes #34388

🆑 
fix:stuff
🆑

* vv

* ASDASD

* daikshu

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* 99999999999999999999999999999

* *tabs*

* Update comp_board_designs.dm
2018-04-06 09:24:47 -05:00
Jordan BrownandCitadelStationBot 0ddf202682 Merge pull request #36872 from kevinz000/totally_not_a_feature
GC debugging features
2018-04-06 09:17:11 -05:00
Jordan BrownandCitadelStationBot 554ed22603 Merge pull request #36997 from DaxDupont/is-this-real-life
Fixes dead chat announcements not using real name.
2018-04-06 09:08:48 -05:00
Jordan BrownandCitadelStationBot 4dbd06b9a2 Merge pull request #36956 from vuonojenmustaturska/anchorbin
Fixes trash bin wrenching message
2018-04-06 09:07:20 -05:00
PKPenguin321andCitadelStationBot 41b90f01e2 READY flash fixes (#36920)
* flash fixes

* switches to get_turf

* fixes the fix

* parent call and comment

added the comment so it doesnt get removed again by accident
2018-04-06 04:05:19 -05:00
Davidj361andCitadelStationBot 1164cec64d Stack Sheets Cancel Button 2018-04-06 03:46:47 -05:00
robbymandCitadelStationBot a4e5a1d02c Fixes null reference not pulsing the 'not scanned' output (#36973) 2018-04-06 03:44:32 -05:00
SailorDaveandCitadelStationBot 107ccfda10 Tweaks mixed blood samples to preserve cloneable if the samples are the same (#36961) 2018-04-06 01:54:15 -05:00
kevinz000andCitadelStationBot 38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
vuonojenmustaturskaandCitadelStationBot aaf3bb66cf Merge pull request #36994 from 81Denton/window-spawner-names
Fixes window spawner names
2018-04-06 00:44:16 -05:00