Commit Graph

131 Commits

Author SHA1 Message Date
LetterJay 2d41b7fe17 EHHH 2017-05-28 15:49:22 -05:00
LetterJay 42edd006b8 A BUNCH OF SHIT 2017-05-28 14:57:17 -05:00
LetterJay fdb54c3ce3 hat 2017-05-27 22:49:20 -05:00
LetterJay c8d071ccf4 25 kill streak with a famas 2017-05-24 12:20:50 -05:00
LetterJay 34e74a377e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442 2017-05-24 08:06:53 -05:00
LetterJay abbacd2c89 Merge branch 'master' into upstream-merge-27160 2017-05-22 16:29:43 -05:00
LetterJay ab50a3eca5 Merge pull request #1068 from Citadel-Station-13/upstream-merge-27283
[MIRROR] Decentralized and Vastly Improved Gang Influence System
2017-05-22 16:28:57 -05:00
CitadelStationBot 4533d31e34 Cult Fixes for Construct Icons and Spells 2017-05-22 10:49:33 -05:00
CitadelStationBot e224a47f53 Two more types of Legion and makes environment_smash levels into defines 2017-05-21 02:52:23 -05:00
CitadelStationBot f624071766 [MIRROR] Ninja Refactor (#1037)
* Ninja Refactor

* Update antagonists.dm

* Delete antagonists.dm.rej

* Update antagonists.dm

* Update mind.dm

* Update mind.dm

* whatever, I fixed that cunt
2017-05-21 00:39:26 -05:00
CitadelStationBot 88ede32216 [MIRROR] Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition (#994)
* Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition

* Rej cleanup

* update mob.dmi

* Update living_defense.dm
2017-05-20 23:00:02 -05:00
CitadelStationBot c39b60b3cf Decentralized and Vastly Improved Gang Influence System 2017-05-20 18:37:48 -05:00
CitadelStationBot 626959d96e [MIRROR] Fixes a bunch more cult bugs (#853)
* Fixes a bunch more cult bugs

* Resolves .rejs and icons
2017-05-18 03:21:07 -05:00
LetterJay 4710beca0e Merge pull request #807 from Citadel-Station-13/upstream-merge-26631
[MIRROR] 2017 Cult Overhaul P1:  Cult Master and Datum Cult
2017-05-16 17:13:30 -04:00
LetterJay eac970c1f1 aids 2017-05-16 16:00:28 -05:00
LetterJay f71a918ac8 screen rem 2017-05-16 15:53:44 -05:00
LetterJay ddee13467a fuck icons 2017-05-16 15:52:22 -05:00
LetterJay 3ba7433371 Delete screen_alert.dmi
fix conflict with Cult rework
2017-05-16 15:44:23 -05:00
CitadelStationBot 962d114339 Petting is better 2017-05-14 07:36:55 -05:00
LetterJay a1c04dd314 Merge pull request #898 from LetterJay/master
Adds a hunter hat to the game/clothesmate
2017-05-12 16:24:17 -04:00
LetterJay 43dd22425b Citadel hat DMI/DM
Cleans up pointless files
2017-05-10 17:33:13 -05:00
kevinz000 41341e50a5 Merge pull request #696 from Citadel-Station-13/upstream-merge-25458
[MIRROR] Belligerent now prevents you from running even between chants
2017-05-07 23:19:35 -07:00
CitadelStationBot 617bb4ed38 Mega arachnid 2017-05-07 08:55:11 -05:00
CitadelStationBot f85a44ed52 2017 Cult Overhaul P1: Cult Master and Datum Cult 2017-05-06 11:56:16 -05:00
CitadelStationBot 49a85dca36 Fixes the Slimecore HUD's neck slot 2017-05-03 04:07:38 -05:00
LetterJay 818940cbc3 Merge pull request #645 from Citadel-Station-13/upstream-merge-26598
[MIRROR] Cult Construct Non-Balance Update
2017-05-02 11:16:12 -05:00
CitadelStationBot 301ad1b0fc Belligerent now prevents you from running even between chants 2017-05-01 12:49:28 -05:00
CitadelStationBot 480b4db2e1 Cult Construct Non-Balance Update 2017-04-28 21:11:31 -05:00
CitadelStationBot 3fa6f63608 Replaces Mending Motor with Mending Mantra 2017-04-28 20:57:31 -05:00
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
LetterJay 417b80bb42 Merge pull request #516 from Verkister/master
Bringing back the dogborgos.
2017-04-26 06:24:26 -05:00
CitadelStationBot fb61c31470 Small abductors refactor 2017-04-25 03:59:08 -05:00
CitadelStationBot 4ee8933e3f Improves Skeleton Hitboxes 2017-04-24 20:55:44 -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
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
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
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 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