Commit Graph

178 Commits

Author SHA1 Message Date
LetterJay
8088ce38cc rej file cleanup 2017-04-25 01:15:04 -05:00
LetterJay
a06c6a2994 Merge pull request #508 from Citadel-Station-13/upstream-merge-26337
[MIRROR] Refactors picture frames to use wall frames system
2017-04-25 01:10:40 -05:00
LetterJay
de1d8188ae removes rej files 2017-04-24 21:34:58 -05:00
LetterJay
88da83f504 Merge pull request #542 from Citadel-Station-13/upstream-merge-26416
[MIRROR] Ghosts no longer drift in space
2017-04-24 21:31:32 -05:00
CitadelStationBot
08a8f8d757 Getting uncuffed resets your clickdelay 2017-04-24 18:09:17 -05:00
CitadelStationBot
ffc35f33ba Ghosts no longer drift in space 2017-04-24 17:53:49 -05:00
CitadelStationBot
cc50235a0f Fixes some facehugger bugs 2017-04-24 17:40:31 -05:00
LetterJay
4833a8e044 Merge pull request #529 from Citadel-Station-13/upstream-merge-26346
[MIRROR] Braining/debraining fixes
2017-04-24 16:46:50 -05:00
CitadelStationBot
de50b582ae Braining/debraining fixes 2017-04-23 14:48:31 -05:00
CitadelStationBot
f58335d5d8 Fixes swarmers speaking common 2017-04-23 13:53:36 -05:00
LetterJay
0db0c55ade Merge pull request #507 from Citadel-Station-13/upstream-merge-26408
[MIRROR] Conveyor movement refactor/fix
2017-04-22 14:36:22 -05:00
CitadelStationBot
05d8550771 Refactors picture frames to use wall frames system 2017-04-21 17:54:34 -05:00
CitadelStationBot
1a93abc66e Conveyor movement refactor/fix 2017-04-21 17:28:09 -05:00
CitadelStationBot
a975a35f92 Fixes languages being understood over radio 2017-04-21 17:24:59 -05:00
Squi-RL
fc1fd4b72b Acorn hologram & bug fix for eevee tails (#471)
* Edited Eevee wag code

fixes the issue where the tail tip color disappears while wagging

* Adds an acorn hologram

as the title says, adds an acorn hologram... it's animated too!

* Adds code to support the Acorn

allows an AI to select "acorn" from the unique hologram catagory
2017-04-20 22:05:17 -05:00
Poojawa
f866139c52 Admin ticket tgstyle (#493)
* some porting

* other changes
2017-04-20 22:00:47 -05:00
LetterJay
de2d0985c4 Merge pull request #440 from Citadel-Station-13/upstream-merge-26134
[MIRROR] Refactors dbcon into a subsystem
2017-04-19 20:46:02 -05:00
LetterJay
1f88a8d866 Merge pull request #475 from Citadel-Station-13/upstream-merge-26334
[MIRROR] Fixes ghosts not hearing whispers with the toggle on
2017-04-19 18:33:56 -05:00
LetterJay
95ec46d54b Merge pull request #489 from Citadel-Station-13/upstream-merge-26319
[MIRROR] Moves simple animal automation from SSmob to SSnpc
2017-04-19 18:33:18 -05:00
LetterJay
b926fd3c8f Merge pull request #486 from Citadel-Station-13/upstream-merge-26366
[MIRROR] Fixes support holoparasites
2017-04-19 18:32:46 -05:00
LetterJay
5e0fd179bb Merge pull request #477 from Citadel-Station-13/upstream-merge-26285
[MIRROR] Cult stuff now initializes
2017-04-19 18:29:35 -05:00
CitadelStationBot
dbd0af6b5c Moves simple animal automation from SSmob to SSnpc 2017-04-19 16:48:45 -05:00
CitadelStationBot
a7cd9335da Fixes support holoparasites 2017-04-19 16:45:31 -05:00
CitadelStationBot
73d4469db5 Cult stuff now initializes 2017-04-19 04:40:07 -05:00
CitadelStationBot
81ad880f54 Fixes ghosts not hearing whispers with the toggle on 2017-04-19 04:33:54 -05:00
CitadelStationBot
23d140abb9 Makes the monkey-to-human effect spawn in the correct position 2017-04-19 04:33:50 -05:00
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
278cbbaf35 Refactors dbcon into a subsystem 2017-04-17 09:46:09 -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