shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,525 Commits 5 Branches 0 Tags
7d93dec924ba16b82afe0f889bbbec9a9af7b4a8
Commit Graph

9819 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
deathride58
1d1c0a5ebb Merge pull request #6284 from Citadel-Station-13/upstream-merge-36560 
[MIRROR] [READY]AI latejoins
 2018-04-08 02:25:10 +00:00
deathride58
cf134192cc Merge pull request #6302 from Citadel-Station-13/upstream-merge-36871 
[MIRROR] Shuttle garbage collection
 2018-04-08 02:24:54 +00:00
deathride58
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
kevinz000
e8561ec98c Shuttle garbage collection (#36871) 
* Shuttle garbage collection

* istype
 2018-04-07 19:50:27 -05:00
vuonojenmustaturska
6ed0eee3f6 Merge pull request #36980 from tgstation/Cyberboss-patch-1 
Prevents direct Del() calls
 2018-04-07 19:47:13 -05:00
AnturK
3de992aee2 Fixes cow tipping properly (#37015) 2018-04-07 18:15:00 -05:00
deathride58
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
deathride58
71344ce953 Merge pull request #6281 from Citadel-Station-13/upstream-merge-36975 
[MIRROR] Removes a sound
 2018-04-07 00:54:31 +00:00
deathride58
57f0cc35b5 Update mapping.dm 2018-04-06 20:54:12 -04:00
deathride58
b88da782aa Update job.dm 2018-04-06 20:53:15 -04:00
deathride58
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
deathride58
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
deathride58
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
deathride58
863ca69d3f Merge pull request #6288 from Citadel-Station-13/upstream-merge-36920 
[MIRROR] READY flash fixes
 2018-04-07 00:50:23 +00:00
deathride58
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
deathride58
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
deathride58
df879ce1ca Merge pull request #6292 from Citadel-Station-13/upstream-merge-36872 
[MIRROR] GC debugging features
 2018-04-07 00:48:47 +00:00
deathride58
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