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

9809 Commits

Author SHA1 Message Date
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
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
AnturK 45a8c65739 Adds kickback to mecha weapons. (#36999) 2018-04-06 14:43:11 -05:00
Tlaltecuhtli 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 Brown 0ddf202682 Merge pull request #36872 from kevinz000/totally_not_a_feature 
GC debugging features
 2018-04-06 09:17:11 -05:00
Jordan Brown 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 Brown 4dbd06b9a2 Merge pull request #36956 from vuonojenmustaturska/anchorbin 
Fixes trash bin wrenching message
 2018-04-06 09:07:20 -05:00
PKPenguin321 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
robbym a4e5a1d02c Fixes null reference not pulsing the 'not scanned' output (#36973) 2018-04-06 03:44:32 -05:00
SailorDave 107ccfda10 Tweaks mixed blood samples to preserve cloneable if the samples are the same (#36961) 2018-04-06 01:54:15 -05:00
kevinz000 38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
vuonojenmustaturska aaf3bb66cf Merge pull request #36994 from 81Denton/window-spawner-names 
Fixes window spawner names
 2018-04-06 00:44:16 -05:00