Commit Graph

613 Commits

Author SHA1 Message Date
Verkister d66e609d48 Bringing back the dogborgos.
-Also replaced the offset breaking forth-reset attack anim with forth-back as I did last time.
-Dogborg pounce is currently broken and slapping people with hud icons may be harmful for immursions.
-No Borgi yet because I can't be arsed to readd the whole sprite set this tired.
2017-04-23 02:36:31 +03:00
LetterJay 8f6e9a729a Merge pull request #421 from LetterJay/master
character data slot fix
2017-04-16 14:10:18 -05:00
LetterJay a2f39d3d89 character data slot fix 2017-04-16 13:20:45 -05:00
LetterJay d696ee958c changelog cleanup 2017-04-16 12:43:13 -05:00
CitadelStationBot e12e69b7ba Adds recharger to Cerestation's shuttle and Removes Centcomm's thunderdome doors (#419) 2017-04-16 11:41:32 -04:00
CitadelStationBot 6979200c9b Adds Pill Bottle Closet to Delta (#418) 2017-04-16 11:41:16 -04: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 5ba6a5e768 resprites shitty remie plants (#411) 2017-04-15 15:25:56 -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
ktccd 74244a3d32 Fixes Taur Overlay issues (#391)
Renames the icon states to use the TAUR layer instead of the BODY FRONT
layer. Also fixes a pixel error in the shepherd taur icon which caused a
hole to appear inside the body.
And cow taur layers are no longer named incorrectly.
2017-04-15 14:58:57 -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
Cw 3040 07303ebcc6 Maint-Bar Fixes (#366)
* Map Fix

Why do I even bother living?

* Tweak pt2
2017-04-15 08:46:33 -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
CitadelStationBot 773ff04310 hotfix for immutable mixtures (#368) 2017-04-15 03:48:26 -04:00
CitadelStationBot fd4b10e8b6 PR Mirror 2017-04-15 01:46:52 -05:00
LetterJay 6f239e6857 PRMirror 2017-04-15 01:03:44 -05:00
Poojawa 9e72b1b8fd /tg/ 4/14 (#367)
* outside code stuff

* defines, helpers, etc

* everything not module

* modules

* compiled fixes + missing sounds
2017-04-14 23:28:04 -05:00
Poojawa 884fb45516 Fixes compile issues with vore code (#362)
* Fixes compile issues with vore code

* Update voreconstants.dm

* Update resize_vr.dm

* Update tgstation.dme

* Update parrot.dm

* Update pet.dm

* Update fox.dm

* Update mouse.dm

* Update farm_animals.dm

* Update dog.dm

* Update cat.dm

* Update monkey.dm

* Update alien.dm

* Update vore_vr.dm

* Update vorepanel_vr.dm

* Update bellymodes_vr.dm

* Update belly_vr.dm

* Update living_vr.dm

* Update voreconstants.dm

* Update fox.dm
2017-04-14 19:39:08 -05:00
LetterJay 412b8da82e Merge pull request #361 from LetterJay/master
adds vore back
2017-04-14 13:51:00 -05:00
LetterJay 971e314b14 wrong map loaded 2017-04-14 13:47:02 -05:00
LetterJay e024cd361d Merge branch 'master' of https://github.com/LetterJay/Citadel-Station-13-6th-Port 2017-04-14 13:43:12 -05:00
LetterJay d0347280ce adds vore back (why this was removed, I have no idea) 2017-04-14 13:40:44 -05:00
LetterJay 097d4326c3 changelogs 2017-04-14 10:43:06 -05:00
Poojawa 7e9b96a00f April sync (#360)
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
2017-04-13 23:37:00 -05:00
Squi-RL cdc32c98fa Eevee/Eeveetaur additions! (#359)
* Adds eevee ears and tail

* Adds eevee neck fur sprite

* Adds an eevee taur sprite

* adds the code for Eevee and it's taur body

allows players to choose said things
2017-04-12 23:38:35 -05:00
Poojawa 8b7bd1dbb8 Removes Sizeplay (#356)
* Update tgstation.dme

Removes sizeplay entirely.

* Update voreconstants.dm

* Update living.dm
2017-04-12 23:37:57 -05:00
ktccd 5bca6c759b Subtle emote fix (#350)
* The Worst Kind of Fix

Doesn't actually fix, instead completely replaces the previous verb that
was named as an EMOTE without being one for real.
Now we use a real emote, shamelessly cribbed together from what I
understood from the custom emote and the base emote procs.
Testing seems to indicate success, now even for simple_mobs, since this
is implemented on the mob/living level. (Should it be on the mob level?
I honestly don't know if basic mobs should have this emote?)

* Removed uneeded prompt

This looks like the same problem the "me" emote has, fixed now. Maybe I
should do the same to the "me" emote later...

* Adds changelog

For players to notice.
2017-04-12 23:37:36 -05:00
TalkingCactus 40cf3e9642 quick fix (#355) 2017-04-11 22:20:48 -04:00
lm40 d64cca1b7e Fixes digestion messages displaying to everyone nearby (#349)
* Update bellymodes_vr.dm

* Update bellymodes_vr.dm

* fuck

* actually no i won't
2017-04-11 14:53:20 -04:00