shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,942 Commits 5 Branches 0 Tags
558a989d8a957504ea3fe0e1a5b3f21ba34e8597
Commit Graph

12374 Commits

Author SHA1 Message Date
LetterJay
dade9c18d9 Merge pull request #439 from Citadel-Station-13/upstream-merge-26228 
[MIRROR] Standardizes subsystem Shutdown order
 2017-04-18 01:13:53 -05:00
LetterJay
27a585f173 Merge pull request #434 from Citadel-Station-13/upstream-merge-26270 
[MIRROR] Makes radio keys table more compact and easy to change
 2017-04-18 01:12:35 -05:00
LetterJay
6e54eb217c Merge pull request #433 from Citadel-Station-13/upstream-merge-26276 
[MIRROR] Removes rogue GLOB from message
 2017-04-18 01:12:11 -05:00
LetterJay
723da20d18 Merge pull request #432 from Citadel-Station-13/upstream-merge-26275 
[MIRROR] Cultists can no longer delay the shuttle after Nar'sie is summoned
 2017-04-18 01:12:02 -05:00
CitadelStationBot
44cc95c24a Slight shotgun tweak to lose a spawn 2017-04-17 17:44:07 -05:00
CitadelStationBot
9c1ab2495a Adds suppression to the foam pistol, smg, and c20r, fixes #26248 2017-04-17 17:44:04 -05:00
CitadelStationBot
7759e8fb08 >Can't stop fucking up spacevine PRs 2017-04-17 17:40:53 -05:00
CitadelStationBot
9d532385c6 Removed commented code from ties.dm 2017-04-17 16:16:41 -05:00
CitadelStationBot
8260ebcc33 fixes the garbage subsystem not working, at all. 2017-04-17 15:33:01 -05:00
CitadelStationBot
3bbda287c9 Adds investigative logging for shooting the SM 2017-04-17 09:46:12 -05:00
CitadelStationBot
278cbbaf35 Refactors dbcon into a subsystem 2017-04-17 09:46:09 -05:00
CitadelStationBot
13d7f88c7a Standardizes subsystem Shutdown order 2017-04-17 09:46:05 -05:00
CitadelStationBot
823e949b27 Makes radio keys table more compact and easy to change 2017-04-17 09:45:42 -05:00
CitadelStationBot
bfcae4eb99 Removes rogue GLOB from message 2017-04-17 09:45:38 -05:00
CitadelStationBot
19647e1c61 Cultists can no longer delay the shuttle after Nar'sie is summoned 2017-04-17 09:45:34 -05:00
CitadelStationBot
dd76874f1c Moves tesla_ignore from var on /mob/living to secondary flag 2017-04-17 09:45:30 -05:00
CitadelStationBot
21827263f5 Fix spacevines again (#428) 2017-04-17 08:37:25 -04:00
CitadelStationBot
841f50a769 Fixes a bug (#427) 2017-04-16 18:16:40 -04:00
CitadelStationBot
6591075c5e Clockwork stuff uses Initialize (#426) 2017-04-16 18:15:48 -04:00
CitadelStationBot
64068fc614 Proximity sensing refactor (#425) 2017-04-16 18:15:29 -04:00
CitadelStationBot
dfd470adf9 Adds an xenobiology access shield wall generator to all maps' except Cerestation's xenobiology (#424) 2017-04-16 18:14:19 -04:00
CitadelStationBot
ba95892ddd Fixes kudzu (#422) 2017-04-16 18:12:29 -04:00
CitadelStationBot
7f97a2c9d7 Drones see pAIs in mobile form without filters (#420) 2017-04-16 18:12:12 -04:00
CitadelStationBot
6102cbbd02 [MIRROR] Makes a change_bodypart_status call use defines (#416) 
* Makes a change_bodypart_status call use defines

* removes rejected file
 2017-04-16 18:11:46 -04:00
LetterJay
a2f39d3d89 character data slot fix 2017-04-16 13:20:45 -05:00
CitadelStationBot
b61ac211a4 Fixes Orion Trail (#417) 2017-04-16 11:41:06 -04:00
CitadelStationBot
8a0262a792 Fixes Emitters: Quickmerge Edition (#415) 2017-04-16 07:06:37 -04:00
TalkingCactus
abd7f2b348 Cleans Up Rejected Mirror files (#414) 
* bang

* updates tgstation.dme

* fixes missing stylesheet entries

* updates the map

includes backup map file

* removes ten billion runtimes
 2017-04-15 17:55:53 -04:00
CitadelStationBot
2373e2e485 Afk fixup (#412) 2017-04-15 15:45:29 -04:00
CitadelStationBot
f510bf2a03 [MIRROR] Fixes master (#409) 
* Fixes master

* adds missing #endif

* Revert "adds missing #endif"

This reverts commit 6e6124ed64ec7593e27a31393b54971c5050a5aa.

* master fix

* removes .rej
 2017-04-15 15:44:00 -04:00
CitadelStationBot
b239a9620a PIXEL_SCALE Test [WIP] (#408) 2017-04-15 15:02:01 -04:00
CitadelStationBot
c38fa1eaa3 Finally kills off my old nemesis of the old fashioned inconsistent shuttle paths (#410) 2017-04-15 15:01:54 -04:00
TalkingCactus
e64ff8152f Fixes Missing Floodlight and Disco-Ball sprites. (#397) 
* quick 1 pixel fix for several sprites

* adds missing light sprites
 2017-04-15 14:58:48 -04:00
CitadelStationBot
ba96400dd1 Remove atom stat cooldown (#407) 2017-04-15 14:51:22 -04:00
CitadelStationBot
c848569d77 Makes the map loader immune to sleeps in the shit it creates (#406) 2017-04-15 14:50:29 -04:00
CitadelStationBot
962dff5a25 Fixes embed messages starting with lowercase "the" (#405) 2017-04-15 14:50:07 -04:00
CitadelStationBot
71941d1b25 Removes 10 seconds from world init time. (#404) 2017-04-15 14:48:59 -04:00
CitadelStationBot
01f28d3f79 Some grammar fixes (#401) 2017-04-15 14:48:50 -04:00
CitadelStationBot
4f4390fe01 Renames the Cleanable/ folder to cleanable/ (#396) 2017-04-15 14:48:29 -04:00
CitadelStationBot
8628b36f25 Cleans up some commented code and adds some undef's to apc.dm (#402) 2017-04-15 14:48:06 -04:00
CitadelStationBot
f3b6d9e007 Adds colours to languages that lack them (#395) 2017-04-15 14:47:39 -04:00
CitadelStationBot
61db5a9ba5 Tweaks some procs in garbage to make profiling it better (#394) 2017-04-15 14:46:56 -04:00
CitadelStationBot
3d5e199568 Fixes #26169, spawned humans no longer spawn eyeless (sprite) (#399) 2017-04-15 14:45:42 -04:00
CitadelStationBot
49cef72564 [s] Fixes RCD,RCLD & ARCD (#403) 2017-04-15 14:44:58 -04:00
CitadelStationBot
4025a985d4 Ghosts call Moved() after Move() (#398) 2017-04-15 14:44:44 -04:00
CitadelStationBot
28dad1c6c4 Tiki mask is no longer expresive (#392) 2017-04-15 14:44:33 -04:00
CitadelStationBot
fe57757fd7 Adds a proc to check if the current thread is from an admin advanced proc call (#400) 2017-04-15 14:41:36 -04:00
CitadelStationBot
09572935ca [MIRROR] Fixes plasmamen burning to death in cloning pods (#382) 
* Fixes plasmamen burning to death in cloning pods

* fix travis
 2017-04-15 14:36:59 -04:00
ktccd
c785038994 Huge Sprite Rework (#342) 
* Revert "Revert "Huge Sprite Rework""

* Compilation of all feedback fixes

This commit contains all the suggested fixes so far and the changes we
came up with through discussion about the code.
For example, genitals **may** now use alternate icons for aroused
states, but does not have to, this is decided by a boolean variable in
the sprite accessory itself, defaulting to not using alternate icons.
Genital icon_state names now follow a new format to match these new
options in a modular way for all kinds of genitals.

* Conflict solving

reformats all the taurs to use the TAUR layer instead of the BODY_FRONT
layer. Same for the new Eevee sprites.

* Committing the old, unfixed file.

This will cause errors if used, but at least it won't cause conflicts.

* Contains fixed sprite names

The shepherd taur body should STILL have a hole in the body due to a
pixel error.
I have forgotten which pixes these are, so.... **le shrug**

* Anger commit

Commiting this in anger. I WILL make it work damnit!

* Proper name fixes.

Also renames the taur cow to no longer have an incorrectly duplicate
icon_state.

* Shepherd taur pixel fix

Fixes the missing pixels from the taur body that caused a hole to appear
when viewed from the sides.

* Conflict resolution

This PR will cause some sprite-breaking overlay errors.
But it's the only way to handle the conflicting .dmi.
So I'll make a separate PR to fix the sprites later.

* Fixes global lists

Now they use whatever weird new system we got for them.
 2017-04-15 07:24:44 -04:00
TalkingCactus
bd1a26de8d 60s->20s (#390) 
Lowers Timer Recovery from 60s to 20s
 2017-04-15 05:48:08 -04:00