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

9898 Commits

Author SHA1 Message Date
LetterJay
8b2ee170bb Merge pull request #6390 from Citadel-Station-13/upstream-merge-37152 
[MIRROR] Fixes conveyor switches.
 2018-04-14 07:39:47 -05:00
LetterJay
47c2bfd13c Merge pull request #6389 from Citadel-Station-13/upstream-merge-36942 
[MIRROR] Fixes tile analyzer
 2018-04-14 07:39:35 -05:00
AnturK
4e7d222224 Fixes conveyors. (#37152) 2018-04-13 04:30:32 -05:00
robbym
b7023e1bbb Fixes tile analyzer (#36942) 
* Fixes tile analyzer

* Added requested changes

* Changed turf content filter to /obj

* Added loop to add mobs to scan list
 2018-04-12 11:48:28 -05:00
Jordie
3a518e0e6d Adds round id to server ban messages (#37114) 
* adds round id to server ban message

* adds round id to ban denied connection message

* adds round id for legacy ban message

* B

* erroneous space
 2018-04-12 11:47:08 -05:00
LetterJay
3cd0591d90 Merge pull request #6334 from Citadel-Station-13/upstream-merge-36858 
[MIRROR] Use a rust DLL for logging
 2018-04-12 07:06:08 -05:00
deathride58
d8e3200d6c Merge pull request #6287 from Citadel-Station-13/upstream-merge-36953 
[MIRROR] Stack Sheets Cancel Button
 2018-04-11 21:40:22 +00:00
deathride58
51147e928f Merge pull request #6307 from Citadel-Station-13/upstream-merge-36974 
[MIRROR] Minor VR sleeper related changes
 2018-04-11 21:40:00 +00:00
deathride58
2658200472 Merge pull request #6337 from Citadel-Station-13/upstream-merge-37070 
[MIRROR] Fixes eminences not being recognized as servants of ratvar
 2018-04-11 21:39:39 +00:00
deathride58
512b5e86c9 Merge pull request #6341 from Citadel-Station-13/upstream-merge-36469 
[MIRROR] AI requires silicon exp instead of crew exp for roundstart role
 2018-04-11 21:38:24 +00:00
deathride58
b4ecb3ef27 Merge pull request #6343 from Citadel-Station-13/upstream-merge-36670 
[MIRROR] Whether or not a pacifist can fire a gun is no longer based on the gun being harmful, but the chambered round being harmful
 2018-04-11 21:37:24 +00:00
deathride58
f89f9c372e Merge pull request #6344 from Citadel-Station-13/upstream-merge-36693 
[MIRROR] Slightly bandaid fix for ntnet json/xorencrypt runtimes
 2018-04-11 21:36:35 +00:00
deathride58
538cb55b68 Merge pull request #6346 from Citadel-Station-13/upstream-merge-36791 
[MIRROR] Cult spell buttons will no longer hold an empty slot in the regular action bar
 2018-04-11 21:35:45 +00:00
deathride58
ce946619b3 Merge pull request #6348 from Citadel-Station-13/upstream-merge-37088 
[MIRROR] Fix double-fullstop in the jukebox's description
 2018-04-11 21:35:21 +00:00
deathride58
1f9d19a92a Merge pull request #6349 from Citadel-Station-13/upstream-merge-36983 
[MIRROR] Provides more control over uplink surplus chances.
 2018-04-11 21:34:56 +00:00
deathride58
6d1ee7c6e9 Merge pull request #6351 from Citadel-Station-13/upstream-merge-36604 
[MIRROR] Code improvements on bullet damage decals
 2018-04-11 21:34:32 +00:00
deathride58
2502bb79bf Merge pull request #6353 from Citadel-Station-13/upstream-merge-37044 
[MIRROR] Fix logic circuits runtime
 2018-04-11 21:32:17 +00:00
deathride58
bca8c97bdf Merge pull request #6356 from Citadel-Station-13/upstream-merge-37082 
[MIRROR] Disables mood traits when mood is disabled
 2018-04-11 21:31:46 +00:00
deathride58
055eacca74 Merge pull request #6358 from Citadel-Station-13/upstream-merge-37073 
[MIRROR] Integrated Circuits Parameter Fixes
 2018-04-11 21:31:17 +00:00
deathride58
dd7cf18694 Merge pull request #6359 from Citadel-Station-13/upstream-merge-37077 
[MIRROR] Fixes warp whistle invis bug
 2018-04-11 21:30:16 +00:00
deathride58
43eee9851c Merge pull request #6360 from Citadel-Station-13/upstream-merge-37094 
[MIRROR] Fixes overlay update for washing bloody hands
 2018-04-11 21:29:52 +00:00
deathride58
6c107f538a Merge pull request #6361 from Citadel-Station-13/upstream-merge-37107 
[MIRROR] Fixes jukebox ghost message spam
 2018-04-11 21:29:28 +00:00
deathride58
1f44356e49 Merge pull request #6364 from Citadel-Station-13/upstream-merge-37120 
[MIRROR] [s] Adds a centcom level check to launchpad.
 2018-04-11 21:28:50 +00:00
deathride58
72dfdb0a63 Merge pull request #6365 from Citadel-Station-13/upstream-merge-37032 
[MIRROR] Forcing the human liver to actually do its job v2
 2018-04-11 21:28:25 +00:00
deathride58
eebe38dc39 Merge pull request #6367 from Citadel-Station-13/upstream-merge-37136 
[MIRROR] Removes some unused math defines/procs
 2018-04-11 21:27:58 +00:00
deathride58
1bec758c65 Merge pull request #6369 from Citadel-Station-13/upstream-merge-37130 
[MIRROR] Adds tesla coil cargo pack
 2018-04-11 21:27:26 +00:00
deathride58
84a94e1894 Merge pull request #6371 from Citadel-Station-13/upstream-merge-37123 
[MIRROR] Keeps SM shuttle shards from being unwrenched
 2018-04-11 21:27:05 +00:00
deathride58
ba276cf374 Merge pull request #6373 from Citadel-Station-13/upstream-merge-37116 
[MIRROR] Fixes order of operations math errors with gas defines.
 2018-04-11 21:26:47 +00:00
deathride58
85cc5c177e Merge pull request #6374 from Citadel-Station-13/upstream-merge-37126 
[MIRROR] Fixes signals being raised too soon
 2018-04-11 21:26:22 +00:00
Jordan Brown
704b42411a Merge pull request #37000 from tgstation/KorPhaeron-patch-2 
Update compile options to make 512 support official
 2018-04-11 15:12:55 -05:00
Jordan Brown
68e0b31cf6 Fixes signals being raised too soon 2018-04-11 15:02:30 -05:00
The_Dreamweaver
adac58f0c2 Fixes order of operations math errors with gas defines. 2018-04-11 15:02:22 -05:00
Denton
0ada58dd4f oof 2018-04-11 14:59:54 -05:00
Denton
04f7fc5788 adds tesla coil crate 2018-04-11 14:57:30 -05:00
ShizCalev
e63553e278 Removes some unused math defines/procs 2018-04-11 14:15:14 -05:00
Winterous
065522800a Forcing the human liver to actually do its job v2 (#37032) 
* Update liver.dm

* Update liver.dm

* Update liver.dm
 2018-04-11 09:33:49 -05:00
Dax Dupont
b6396256db [s] Adds a centcom level check to launchpad. (#37120) 
* Adds a centcom level check to launchpad

* Account for space americans
 2018-04-11 08:58:50 -05:00
ShizCalev
f344bc76fe Fixes jukebox ghost message spam (#37107) 2018-04-11 07:31:57 -05:00
pigeons
d14df868cd Fixes overlay update for washing bloody hands (#37094) 2018-04-11 07:30:45 -05:00
vuonojenmustaturska
e9d2097610 Fixes warp whistle invis bug (#37077) 
* Update artefact.dm

* review
 2018-04-11 07:28:30 -05:00
Trevor Serpas
00f5570ccf Integrated Circuits Parameter Fixes 2018-04-11 07:22:11 -05:00
Ashe Higgs
74f1b21a18 Disables mood traits when mood is disabled (#37082) 
* disables mood traits if mood is off

* my copypasta is showing

* Update negative.dm
 2018-04-11 07:06:23 -05:00
arsserpentarium
0f23e55927 Fix logic circuits runtime (#37044) 
* 1011101 fix fix fix xif xif xif 1011101

* Update logic.dm
 2018-04-11 05:23:28 -05:00
nicbn
f45a552c42 Code improvements on bullet damage decals (#36604) 
Now fixing the dents is instant too

Maybe fixes #36601
 2018-04-11 05:21:03 -05:00
Grandmother of 50
43e0079981 Provides more control over uplink surplus chances. (#36983) 
Cant wait for the epic balance prs that people will fight in
 2018-04-11 05:16:32 -05:00
Tad Hardesty
ae16d62178 Fix double-fullstop in the jukebox's description (#37088) 2018-04-11 05:15:19 -05:00
Robustin
a79a168d2c Cult spell buttons will no longer hold an empty slot in the regular action bar (#36791) 2018-04-11 05:08:47 -05:00
oranges
f01620acef Merge pull request #36693 from kevinz000/patch-471 
Slightly bandaid fix for ntnet json/xorencrypt runtimes
 2018-04-11 05:02:19 -05:00
iksyp
5a06fd98ed Whether or not a pacifist can fire a gun is no longer based on the gun being harmful, but the chambered round being harmful (#36670) 
fix: makes dragnet non harmful
tweak: pacifists can now use any disabler or stun setting on any energy gun
code: removed all of the pacifism check code from code/modules/mob/living/living.dm
code: gun objects no longer have a harmful variable, instead, ammo_casing objects now have a harmful variable, which is by default set to TRUE
code: if a pacifist fires a gun, it checks whether or not the round chambered is lethal, instead of whether or not the gun itself is lethal.
 2018-04-11 04:59:57 -05:00
pigeons
7a07c101df AI requires silicon exp instead of crew exp for roundstart role (#36469) 
* Ai requires silicon xp

* Reverses byond age change
 2018-04-11 04:54:32 -05:00