Commit Graph

600 Commits

Author SHA1 Message Date
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
Poojawa
194c5ca57f Update README.md 2017-04-11 04:36:20 -05:00
Poojawa
9f0da4288e Update README.md
reflects Citadel station information.
2017-04-11 04:30:30 -05:00
TalkingCactus
89a99d78d1 Adminhelp prompts will now be larger to allow you to proofread large responses and PMs (#345)
* bigger box

* even bigger

well not really, but it's better anyway

* fuck i didn't tick these

* bigger /me input

double emote size as well, stop complaining about cutoffs and don't make
me regret this

* cleanup
2017-04-09 05:53:44 -04:00
LetterJay
aa5cc241f7 Merge pull request #340 from Citadel-Station-13/revert-339-Genital_Overlays
Revert "Huge Sprite Rework"
2017-04-04 16:35:35 -05:00
LetterJay
d12a1d88a5 Revert "Huge Sprite Rework" 2017-04-04 16:34:55 -05:00
LetterJay
20f1647d77 Merge pull request #339 from ktccd/Genital_Overlays
Huge Sprite Rework
2017-04-04 14:03:29 -05:00
ktccd
073e0a8351 Adds changelog
Adds a changelog that is more readable to the players than what's in the
PR.
The PR changelog itself is more for coders to read, as it has more
details that players wouldn't care about.
2017-04-04 17:45:05 +02:00
ktccd
cc1768b872 Huge Sprite Rework
This is a big one, I reworked:
Vagina sprites, Breast sprites, both onmob and item, and some Taur
sprites
How Taur sprites are layered, finally making genitals show for Nagas as
they should.
How colours are chosen (Humans can enable/disabled matching genitals to
their skintones, everyone else has to pick a colour).
Vaginas and Breasts now follow the same naming convention for sprites
that penises use, so all genital organs can be rendered using the same
piece of code. This means that breast sizes have dropped to
single-letter variants, since those are what we got sprites for (Because
the cup-size is now the Size of the obj).
Breasts now have shapes! So far we only got the "pair" shape, but we got
code-support for other variants.
Vaginas can now also be chosen and will render properly, meaning we now
have more of them to choose from (Some of them terrifying). They don't
really use a size, but there's code support for it if sprites would be
made for it.
Breast items now change their size and color to the owner's when/if they
somehow lose the organs (gibbing for example). Both Breasts and Vaginas
change their description to match what the object is set to look like,
sprites are lacking in that area however.
Minor variable error in the penis-description code fixed.
Taur sprites renamed to use the correct layers. Shephard sprite bug
fixed where there was a missing 2 pixels in the middle of the body.
2017-04-04 17:28:42 +02:00
katnep
b26319cb16 Access changes for chaplain g.tech and engineers (#297)
* access tweaks

removes maint access from roles that don't need them, I.E janitor, and
assistant

* assistant tweak

removed checking for assistants have maint config

* Revert "assistant tweak"

This reverts commit 63fe914117a9e9c6b52a9effe29c2131c8da7a4e.

* Revert "access tweaks"

This reverts commit 68144943ee0e8b33cd8560a9dd4620532891424c.

* access changes (actually valid edition)

adds atmos access to engineers even on high pop rounds, because atmos
have all engi access and it makes sense to have it the other way round

strips the science access of geneticist because they don't actually need
to be in there even if they are technically researching genetics

* chaplain

removes chaplain theatre access becuase they don't really need it

* detective sec access

gives detective security access on skeleton crew

* Update security.dm
2017-04-03 14:47:51 -04:00
LetterJay
2e285dff0b Merge pull request #335 from TaxMaster/VendingPartDuo
VG Vending 2: Free Market Boogaloo
2017-04-03 02:54:12 -05:00
LetterJay
6ae099b4ce Merge pull request #326 from Cw3040/master
Minor Edits to Box
2017-04-03 02:18:14 -05:00
LetterJay
1303211715 test 2017-04-03 02:03:19 -05:00
TaxMaster
719b5a3e96 aaa
aaa
2017-04-02 19:35:32 -05:00