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

5803 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
AnturK
73efe7245c Fixes slime latching (#37002) 2018-04-08 04:59:02 -05: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
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
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
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
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
Jordan Brown
66dabf4ff7 Merge pull request #36976 from Iamgoofball/patch-422 
fixes cows moving while tipped
 2018-04-06 00:43:38 -05:00
LetterJay
49fd917fee Merge pull request #6252 from Citadel-Station-13/kevinz000-patch-4 
looc now obeys ooc bans
 2018-04-05 07:35:43 -05:00
deathride58
a275a787c1 Merge pull request #6224 from Citadel-Station-13/upstream-merge-36815 
[MIRROR] Refactors Dance Machine + deletes a bunch of sound files
 2018-04-05 00:17:27 +00:00
kevinz000
3d26bf4355 Worse than ERP 2018-04-04 14:27:50 -07:00
kevinz000
f94ff21968 readds handholding 2018-04-04 14:24:57 -07:00