Commit Graph

151 Commits

Author SHA1 Message Date
Poojawa
ce577dc22c Citadel sprite file cleanups (#429)
* Special folder cleanup

moved mam_body_markings and mam_taur to regular mob list for easier
locating. moved tail.dmi and wing.dmi to special

* oh

* this too.

* ports #423

alphabetatizes sprites because it was messy

* tweak special folder name to be clearer

* Travis appeasement
2017-04-18 23:05:17 -05:00
LetterJay
58d2d4230f Merge pull request #468 from Citadel-Station-13/upstream-merge-26315
[MIRROR] Micro optimization for handle_breathing
2017-04-18 20:33:44 -05:00
CitadelStationBot
e0b1c95b79 Micro optimization for handle_breathing 2017-04-18 18:14:03 -05:00
CitadelStationBot
0c19ba163e Arbitary code cleaning 2017-04-18 18:05:33 -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
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
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
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
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
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
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
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
d0347280ce adds vore back (why this was removed, I have no idea) 2017-04-14 13:40:44 -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
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
d12a1d88a5 Revert "Huge Sprite Rework" 2017-04-04 16:34:55 -05: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
ktccd
2707ddd750 Cloning-Genitalia-Fix (#277)
* Cloning-Genitalia-Fix

Fixes the issue with genitals not being re-created with cloning. This
should make it so other methods of coming back also gives the organs
your DNA says you should have, such as podding people.

* Sanity checks and fixes

Removed the OLD sanity check for drawing eyes. It was refusing to draw
eyes if you had ANY disability. 's far as I know, blind people still
have eyes and so do mute people.
Also, put a sanity check in give_genitals, just in case a species has
DNA with genitals but is a NOGENITALS species. Somehow. IT COULD HAPPEN,
ALRIGHT?! ^^

* TRAVIS LOVE ME AGAIN

This commit fixes the problem that made Travis hate me previously. Even
though THAT part of the code had not been changed...
Anyway, it looks more neat now, so that's good.
2017-04-01 11:40:12 -04:00
ktccd
376dd1f89a Adds custom emotes to slimes (#320)
Does not add the other human emotes, since they seem a bit odd to put
in.
Slimes needs custom emotes for... reasons. You all know why, don't make
me say it in writing! >_<
2017-03-29 22:57:45 -04:00
TalkingCactus
756180afd6 Automatic MC Re-Starter 9000 (#319)
* fixed runtime in air.dm

fix was made in LINDA_turf_tile.dm though

* fixes runtime in corpse.dm

* fixes runtime in species.dm

* automatically restarts the MC sometimes

When the timer SS crashes, here's the fix

hardcoded with love

* supermatter area icon

* better admin logs

* better mentorhelp message for admins

* fixes map
2017-03-27 03:16:56 -04:00
TalkingCactus
c997ebcabd Removes Lag (tm) (#313)
* sensible fixes

* this too

* some more

* fixes chair icons

reverted to state before tg pull

* fixes telecomms icons

revert to state before tg pull

* fixes research icons

reverted to before tg pull

* de-whitewashed the stools

* fixed missing broadcaster sprites

* always load from the savefile

helps custom servers who don't want to fuck with the config, this will
never not be wanted with the system we have

* stop it, ghosts

* fixes limb augmentation

https://github.com/tgstation/tgstation/pull/25446

* removes lag

* re-adds sounds

* exception

* makes travis happy
2017-03-26 09:39:29 -04:00
ktccd
6db6e99830 Ghost-role arousal fix (#283)
* Ghost-role arousal fix

Fixes it so ghost role spawners respect arousal preferences of the
ghost.

* Arousal should respect species traits

This is *currently* having no effect, as no species at the time of
writing uses NOGENITALS species trait. But good for future species I
think.

* Arousal-fix-fixed

Made on_species_gain do the arousal check and apply it properly. Moved
equip to happen AFTER the ckey is assigned, as I couldn't check the
clients prefs before that and it just defaulted to TRUE.
Problem: Human ghost-roles are already human and would not use
on_species_gain. I had 2 fixes for this: Either I made them do so
anyway, doing set_species with human. This is probably redundant and
might break things in some unexpected way....
2nd possible fix is what I am pushing now, just making an else statement
for that situation.
2017-03-26 06:32:51 -04:00
Poojawa
7ad5e22830 Wew lad (#305)
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors

* based cyberboss.

* you'd think github would suck less.

* vendors

* tweaks and specialty vendors.

* map things

* go away shitty omega

* qdeletion spam supress, maps.txt tweaks

* shuttle lights
2017-03-22 02:55:33 -05:00
TalkingCactus
fcc5e0e2f5 fixes preview icon runtimes+ (#304) 2017-03-21 21:22:47 -05:00
Poojawa
f67e9f6d87 Bleeding edgy refresh (#303)
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
2017-03-21 11:44:10 -05:00
LetterJay
3e294af826 'Give' verb 2017-03-19 13:57:12 -05:00
Verkister
df8d69535b New attempt at fixing shit. Also some sprite stuff.
-Messed around with another air proc I saw runtiming on server.
-Attempted to fix overlays even further. Test run successful but you never know with random chances that hopefully are now as low as the test run let me see.
-Meddled around with transit space. 2 directions were missing a corrective step against negative rng output.
-Added otie snouts.
-Improved contrast in the corvid markings.
-Added tail wag sprites for husky and otie.
2017-03-18 14:08:10 +02:00
Poojawa
b26c52ebd2 Fixes vendies and glasses (#257) 2017-02-28 23:10:46 -06:00
Poojawa
0bca862419 Overhauls and 2/28 sync (#244)
* map tweaks/shuttle engines

* helpers and defines

* global/onclick

* controllers and datums

* mapping

* game folder

* some other stuff

* some modules

* modules that aren't mobs

* some mob stuff

* new player stuff

* mob living

* silicon stuff

* simple animal things

* carbon/ayylmao

* update_icons

* carbon/human

* sounds and tools

* icons and stuff

* hippie grinder changes + tgui

* kitchen.dmi

* compile issues fixed

* mapfix

* Mapfixes 2.0

* mapedit2.0

* mapmerger pls

* Revert "mapedit2.0"

This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481.

* clean up vore folder + 2 hotfixes

* admin ticket refinement

* Blob tweaks and LAZYADD

* LAZYADD IS LAZY

* Magic strings purged

* DEFINES NEED HIGHER PRIORITIES

* Only a sleepless idiot deals in absolute TRUE|FALSE

* u h g

* progress bar fix

* reverts ticket logs

* there's always that one guy

* fixes and stuff

* 2/27 fixes

* game folder stuff

* stats

* some modules again

* clothing stuff

gets vg clothing out of the main files

* everything not mobs again

* mob stuff

* maps, tgui, sql stuff

* icons

* additional fixes and compile errors

* don't need this anymore

* Oh right this isn't needed anymore

* maint bar re-added

* that doesn't need to be here

* stupid events

* wtfeven

* probably makes Travis happy

* don't care to fix the grinder atm

* fixes vending sprites, changes turret

* lethal, not lethals

* overylays are finicky creatures

* lazy fix for bleeding edgy (#252)

* map tweaks/shuttle engines

* helpers and defines

* global/onclick

* controllers and datums

* mapping

* game folder

* some other stuff

* some modules

* modules that aren't mobs

* some mob stuff

* new player stuff

* mob living

* silicon stuff

* simple animal things

* carbon/ayylmao

* update_icons

* carbon/human

* sounds and tools

* icons and stuff

* hippie grinder changes + tgui

* kitchen.dmi

* compile issues fixed

* mapfix

* Mapfixes 2.0

* mapedit2.0

* mapmerger pls

* Revert "mapedit2.0"

This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481.

* clean up vore folder + 2 hotfixes

* admin ticket refinement

* Blob tweaks and LAZYADD

* LAZYADD IS LAZY

* Magic strings purged

* DEFINES NEED HIGHER PRIORITIES

* Only a sleepless idiot deals in absolute TRUE|FALSE

* u h g

* progress bar fix

* reverts ticket logs

* there's always that one guy

* fixes and stuff

* 2/27 fixes

* game folder stuff

* stats

* some modules again

* clothing stuff

gets vg clothing out of the main files

* everything not mobs again

* mob stuff

* maps, tgui, sql stuff

* icons

* additional fixes and compile errors

* don't need this anymore

* Oh right this isn't needed anymore

* maint bar re-added

* that doesn't need to be here

* stupid events

* wtfeven

* probably makes Travis happy

* don't care to fix the grinder atm

* fixes vending sprites, changes turret

* lethal, not lethals

* overylays are finicky creatures
2017-02-28 09:30:49 -06:00
LetterJay
7074b28401 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-02-27 16:29:50 -06:00
LetterJay
586021483e no click! 2017-02-27 16:29:28 -06:00
LetterJay
640954498f move everything back to irc 2017-02-26 13:29:18 -06:00
TalkingCactus
7e75b904ef fixes runtime (#245) 2017-02-25 09:06:45 -05:00
TalkingCactus
36c580c236 The Update (#241)
* auto vote runtime error fix

* part 1

* adds a wolf pai sprite

modified fox sprite that doesn't make your eyes bleed

* missed a painful sprite

* part 2

* ptwhatever

* save

* conflict resolution pt1

* conflict resolution pt2

* almost done with the preferences shit

* fixes missing arousal HUD

* file rename

* even more

* keep the panic commits coming

* forgot one

* wew, gonna go make some small changes

* s o o n

* LOOC admin and player toggles

* fixed backpacks and taurs clipping on the preview

* fixed penis length saving

* typo fix

* arousal fix

* icon tuning

* final
2017-02-24 21:42:15 -05:00
TalkingCactus
2ecae386bb Wolf pAI Chassis (#237)
* wolf pai chassis

* sprite tweak
2017-02-20 01:05:32 -05:00
TalkingCactus
0453438a7a Several Balance and Convenience Changes (#235)
* swarmers slowed down

* drones slowed down so they're controllable again

* cake hat force reduced to 6 from 15

* welding tool balance changes
2017-02-18 04:00:27 -05:00
Poojawa
fc2dbcd9fe Tg port 2 15 (#230)
* defines/helpers

* globalvars, onclick, controllers

* datums and game

* woooooooooorld. Uh. dm

* modules sans mobs client admin

* modules/admin

* pref shit

* modules/mob

* icon updates

* extra things

* Cherrypicked fixes from open PRs

* metastation.tgm fix

* a better meta fix

* reverts async breakings
2017-02-15 03:35:32 -06:00
LetterJay
e649b81cc1 adds tongues to alien butcher loot tale 2017-02-13 09:00:43 -06:00
Poojawa
00436e7495 Gibber and fixes (#217)
* citadel memes and cryopod icon fix

* tailwag fix
2017-02-12 07:55:49 -06:00
Poojawa
6674f9fc15 Tg 2 11 sync (#215)
* first series of updates

* datums

* games folder

* admin and atmosia stuffs

* moar

* mob updates borg riding

* sprites and stuff

* fixes for various things

* oops. some missed fixes
2017-02-12 03:56:14 -06:00
Poojawa
449614df96 Actually cleans up un-needed files. (#210)
* actually gets rid of excess files

* obsolete admin files
2017-02-08 22:35:56 -06:00