Commit Graph

304 Commits

Author SHA1 Message Date
LetterJay
799c642ecd Merge pull request #467 from Citadel-Station-13/upstream-merge-26317
[MIRROR] Makes malf-hacked APCs vulnerable to aliens
2017-04-18 20:33:34 -05:00
LetterJay
bf9b06ee8b Merge pull request #466 from Citadel-Station-13/upstream-merge-26283
[MIRROR] Stethoscope fixes
2017-04-18 20:32:09 -05:00
LetterJay
0735c6f59a Merge pull request #465 from Citadel-Station-13/upstream-merge-26277
[MIRROR] Adds feedback for photocopier on something specific.
2017-04-18 20:31:57 -05:00
LetterJay
950752b1f9 Merge pull request #463 from Citadel-Station-13/upstream-merge-26298
[MIRROR] Revert unrelated change from #24878
2017-04-18 20:31:36 -05:00
LetterJay
65dd63b710 Merge pull request #462 from Citadel-Station-13/upstream-merge-26300
[MIRROR] Arbitary code cleaning
2017-04-18 20:28:20 -05:00
LetterJay
97016b0872 Merge pull request #460 from Citadel-Station-13/upstream-merge-26323
[MIRROR] Speeds up lighting initialization
2017-04-18 20:23:41 -05:00
CitadelStationBot
ee2581bd76 Makes malf-hacked APCs vulnerable to aliens 2017-04-18 18:13:58 -05:00
CitadelStationBot
68a67c703c Stethoscope fixes 2017-04-18 18:09:51 -05:00
CitadelStationBot
47b83e746e Adds feedback for photocopier on something specific. 2017-04-18 18:07:45 -05:00
CitadelStationBot
b32105d315 Revert unrelated change from #24878 2017-04-18 18:05:37 -05:00
CitadelStationBot
0c19ba163e Arbitary code cleaning 2017-04-18 18:05:33 -05:00
CitadelStationBot
d19efeba8b Speeds up lighting initialization 2017-04-18 18:02:23 -05:00
CitadelStationBot
53ac3bcb82 Normalizes how some lighting things GC 2017-04-18 18:02:20 -05:00
TalkingCactus
6f0aa809df Patches for 4/18/17 (#454)
* fixes modular receiver sprites

* fixes legs rendering for taurs

* fixes shoes not rendering in UI for nagas

* typo fix in preferences.dm

* crewsimov

* Revert "fixes legs rendering for taurs"

This reverts commit 8a64c0c80af8a6798639bb151d1448eeb454ac5d.

* fixes looc logging

* fixes gamemode voting

* admin respawn bypass

* thanks GitHub Desktop

totally wanted to omit the very important if()

* proc tweak

* savefile sanitizing
2017-04-18 18:38:23 -04:00
LetterJay
cfd79eb7b7 Merge pull request #449 from Citadel-Station-13/upstream-merge-26296
[MIRROR] Slight shotgun tweak to lose a spawn
2017-04-18 01:16:08 -05:00
LetterJay
228cf30ca0 Merge pull request #448 from Citadel-Station-13/upstream-merge-26288
[MIRROR] Adds suppression to the foam pistol, smg, and c20r, fixes #26248
2017-04-18 01:15:53 -05:00
LetterJay
9050099156 Merge pull request #446 from Citadel-Station-13/upstream-merge-26291
[MIRROR] >Can't stop fucking up spacevine PRs
2017-04-18 01:15:29 -05:00
LetterJay
85f2f651d3 Merge pull request #444 from Citadel-Station-13/upstream-merge-26301
[MIRROR] Removed commented code from ties.dm
2017-04-18 01:15:19 -05:00
LetterJay
06a3a12172 Merge pull request #441 from Citadel-Station-13/upstream-merge-26231
[MIRROR] Adds investigative logging for shooting the SM
2017-04-18 01:14:54 -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
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
3bbda287c9 Adds investigative logging for shooting the SM 2017-04-17 09:46:12 -05:00
CitadelStationBot
823e949b27 Makes radio keys table more compact and easy to change 2017-04-17 09:45:42 -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
64068fc614 Proximity sensing refactor (#425) 2017-04-16 18:15:29 -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
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
c38fa1eaa3 Finally kills off my old nemesis of the old fashioned inconsistent shuttle paths (#410) 2017-04-15 15:01:54 -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
01f28d3f79 Some grammar fixes (#401) 2017-04-15 14:48:50 -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
3d5e199568 Fixes #26169, spawned humans no longer spawn eyeless (sprite) (#399) 2017-04-15 14:45:42 -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
CitadelStationBot
773ff04310 hotfix for immutable mixtures (#368) 2017-04-15 03:48:26 -04:00