Commit Graph

133 Commits

Author SHA1 Message Date
CitadelStationBot b1d6b6a277 [MIRROR] Drake swooping is smoother and more dangerous (#571)
* Drake swooping is smoother and more dangerous

* Update dragon.dm

* Delete dragon.dm.rej
2017-04-26 10:11:33 -05:00
CitadelStationBot 84321916a5 Refactors ears into organs (#513)
* Refactors ear damage into ear organs

* Update human.dm

* Update species.dm

* Delete species.dm.rej

* Update tgstation.dme

* Delete tgstation.dme.rej

* Delete human.dm.rej

* Update tongue.dm

* Delete surgery.dmi

* upload fixed surgery.dmi
2017-04-26 09:52:35 -05:00
LetterJay aa27e92afb Merge pull request #574 from Citadel-Station-13/upstream-merge-26474
[MIRROR] Gas injectors are now buildable
2017-04-26 06:45:09 -05:00
LetterJay 417b80bb42 Merge pull request #516 from Verkister/master
Bringing back the dogborgos.
2017-04-26 06:24:26 -05:00
CitadelStationBot 45e9b1644e Gas injectors are now buildable 2017-04-26 04:35:40 -05:00
CitadelStationBot fb61c31470 Small abductors refactor 2017-04-25 03:59:08 -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
CitadelStationBot 4ee8933e3f Improves Skeleton Hitboxes 2017-04-24 20:55:44 -05:00
CitadelStationBot 682a00b768 Greyscale lighters no longer color the flame (#517) 2017-04-23 01:35:43 -05:00
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
CitadelStationBot 05d8550771 Refactors picture frames to use wall frames system 2017-04-21 17:54:34 -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 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
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 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
CitadelStationBot 9c1ab2495a Adds suppression to the foam pistol, smg, and c20r, fixes #26248 2017-04-17 17:44:04 -05:00
CitadelStationBot 35f7007519 Fixes bman's plant sprites, take two. 2017-04-17 09:45:57 -05:00
CitadelStationBot 5ba6a5e768 resprites shitty remie plants (#411) 2017-04-15 15:25:56 -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
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
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 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
TaxMaster 45548d26c6 THIS (DOESN'T) VIOLATE THE NAP
Clothing 2: If it doesn't pass i'm seriously going to stop trying
boogaloo
2017-04-01 22:50:05 -05: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
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
Squi-RL 099a6c8764 Ash drake plushie! (#300)
* Update toys.dm

Adds a cute little Ash drake plushie at the bottom

* Add files via upload

* Adds in hand icons for the ash drake plushie

* removed the commented out lines from the plush drake code
2017-03-21 05:47:47 -05:00
Verkister dc18472d72 It's been a long day okay :v 2017-03-19 02:20:04 +02:00
Verkister 1a284fc66d Goddamnit how in the hell did I manage to forget both new wagtails behind views. 2017-03-19 02:05:44 +02:00
Verkister 98cb8767b5 Stealing overlay fix from tg.
Also forgot one tailwag sprite last time.
2017-03-19 01:46:56 +02:00
Verkister 62705e87f6 git is being a butt again 2017-03-18 14:10:14 +02: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
LetterJay 9ce20fae93 Revert "Revert "Revert "Little but possibly hella important fixes""" 2017-03-17 22:44:45 -05:00
Verkister 545dec9826 Revert "Revert "Little but possibly hella important fixes"" 2017-03-16 09:14:53 +02:00
LetterJay ed435e7e2f Revert "Little but possibly hella important fixes" 2017-03-15 20:20:22 -05:00
LetterJay be00b14221 Merge pull request #281 from Verkister/master
Little but possibly hella important fixes
2017-03-15 21:02:12 -04:00
Verkister afb8d2a006 Fixes missing lizard front snouts using the shit-functional "FRONT" layer.
(our custom mammal snouts are all on ADJ layer and work just fine)
2017-03-15 11:30:52 +02:00
Verkister bb879dfac8 -Fixes overlay stuff such as character creation preview. (one of main runtime issues out there currently)
-Probably fixes a missing proc with air runtimes too, which has been one of the problemos appearing in tandem with MC borkage (next line under was MC related anyway)
-Husky tail wag sprites renamed correctly (inverted color order). Actual movement yet to come.
2017-03-15 10:52:00 +02:00
TalkingCactus 09ec454325 Random Fixes + Dildos (#268)
* I'LL SNEAK THIS IN, TOO

* will it blend

* event tweaking

* new kinkmate sprite

* savefile bugfixes

* drinks got overwritten again

rip

* replaces missing styles

* dildos

* last bit
2017-03-10 12:51:16 -05:00
Poojawa b26c52ebd2 Fixes vendies and glasses (#257) 2017-02-28 23:10:46 -06:00
TalkingCactus 7023a22d61 Fixes Icons and Map (#253)
* reverts research.dmi overwrite

adds bluespace material insertion

* reverts kitchen.dmi overwrite

included idle light for grinder

* de-whitewashed stools

* fixes laser carbine design

THE PINS

* fixes maint bar and most of the cams

* dmm2tgm
2017-02-28 14:02:08 -05: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
TaxMaster 93782cf716 Adds VG weaponry to the server (#243)
* Adds in clothing from the /vg/ rip

* adds clothing from the /vg/ rip

* Adds VG weaponry to the server

Adds VG weaponry to the server, most of it is intended for the bussing
admin so its not obtainable normally.

This also adds in toy megabusters to the arcade machine toy list and two
vending machines intended for adminbus/events/thunderdome.

* aa

fixing even more shit

* aaa

*external code related screaming*

* aaa

funfact: that insistence on modualization broke *EVERYTHING* for the
guns. I doubt I'll fix this.

* Fixes more shit

After I finally worked the salt out from yesterday, I modularized the
code more to the standard required. It seems that the sprites for the
guns/projectiles/vending machines need to be in the titled DMI files, at
least from my observations.

* *internal screaming*

why

* more shit fixed

no impact sounds for the plasmaguns / actual buster. Now there are
sounds.

* (Hopefully) Finaly update with this.

Salty removed, modularized it.

Hope its all good now.

* aaa

Pain.

* final fix

missing sprites fixed
2017-02-28 07:55:22 -06:00
TalkingCactus 2cf17f19df New Icons (#249)
* mech fab

* intercoms

* SMES + APC

* autolathe + pipedisp

* light tubes, light fixtures

* microwave + food processor

* detective revolver

* new laser gun

* R&D machines

* all tcomms machinery

not included: AAS

* new chairs+stools

* cameras + air alarms

* revolver and laser carbine
2017-02-27 15:30:12 -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 bd13d677d4 Sweater Weather (#236)
* adds 5 new sweaters

cream blue green purple red

* fuck this didn't go through

* done

* WAIT

* Rename sweaters.dm to cit_uniforms.dm

* .dme fix

* 42
2017-02-20 01:05:49 -05:00
TalkingCactus 2ecae386bb Wolf pAI Chassis (#237)
* wolf pai chassis

* sprite tweak
2017-02-20 01:05:32 -05:00