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

5787 Commits

Author SHA1 Message Date
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
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
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
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
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
deathride58
f4ebb8d2e9 Merge pull request #6228 from Citadel-Station-13/kevinz000-patch-1 
Nerfs beam rifle effectiveness vs blob
 2018-04-04 21:20:12 +00:00
deathride58
a8a7754b22 Merge pull request #6256 from Citadel-Station-13/upstream-merge-36598 
[MIRROR] Fixes bloodbath effects not working on people in crit
 2018-04-04 21:16:21 +00:00
deathride58
5f215ff2b4 Merge pull request #6257 from Citadel-Station-13/upstream-merge-36733 
[MIRROR] podpeople, wishgranter victims, and clones no longer get 0 as one of their affixes (?)
 2018-04-04 21:15:55 +00:00
deathride58
af8862bd78 Merge pull request #6263 from Citadel-Station-13/upstream-merge-36867 
[MIRROR] Fixes 0 value not being saved in constant memory circuits
 2018-04-04 21:11:44 +00:00
deathride58
cd251d79b2 Merge pull request #6264 from Citadel-Station-13/upstream-merge-36645 
[MIRROR] Fixes mannitol not curing minor brain traumas
 2018-04-04 21:11:28 +00:00
deathride58
fdea6d88aa Merge pull request #6266 from Citadel-Station-13/upstream-merge-36897 
[MIRROR] Fixes errors with making temp rank changes before permanent ones
 2018-04-04 21:10:47 +00:00
deathride58
e6f411ae5d Merge pull request #6268 from Citadel-Station-13/upstream-merge-36969 
[MIRROR] move enforce_human_authority check before species.before_equip_job()
 2018-04-04 21:04:30 +00:00
deathride58
3eec79f992 Merge pull request #6269 from Citadel-Station-13/upstream-merge-36929 
[MIRROR] Fixes chem macros with trailing ;
 2018-04-04 21:02:22 +00:00
deathride58
5f4509123c Merge pull request #6271 from Citadel-Station-13/upstream-merge-36521 
[MIRROR] Burning ores (from either fire or lava) now yields materials at a decreased rate.
 2018-04-04 21:02:05 +00:00
fludd12
fc9b02cbbb Burning ores (from either fire or lava) now yields materials at a decreased rate. (#36521) 
* Burning ores (from either fire or lava) now yields materials at a decreased rate.

* Randomizes the returns!
 2018-04-04 12:00:57 -05:00
vuonojenmustaturska
4b505112fc fixes revenant deadchat 2018-04-04 09:07:06 -05:00
Jordan Brown
057d10f654 Fixes chem macros with trailing ; 2018-04-04 09:04:53 -05:00
vuonojenmustaturska
77e51603d4 move enforce_human_authority check before species.before_equip_job() 2018-04-04 09:03:37 -05:00
Jordie
00f5f70b1b Fixes errors with making temp rank changes before permanent ones (#36897) 
* fixes errors with making temp rank changes before permanent ones

* adds parenthesis
 2018-04-03 23:51:45 -05:00
YPOQ
1ee5b349d7 Fixes mannitol not curing minor brain traumas (#36645) 
* Fixes mannitol not curing brain traumas

* Makes has_trauma_type random, adds type arg to cure_trauma_type

* Adds get_traumas_type proc

* Default to /datum/brain_trauma
 2018-04-03 22:03:20 -05:00
robbym
1e34269e0c Fixes 0 value not being saved in constant memory circuits (#36867) 
* Fixes 0 value not being saved in constant memory circuits

* Fixes 0 value not being loaded in constant memory circuits

* Switched to isnull proc for null checks
 2018-04-03 22:03:12 -05:00