Commit Graph
142 Commits
Author SHA1 Message Date
PoojawaandGitHub b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
PoojawaandGitHub 36a1898bde Dogborg balance tweaks (#1805)
* Update dogborgstuff.dm

* Compile fixes

* minor code standards tweaks
2017-07-05 10:01:57 -05:00
lm40andGitHub bac7abb9d6 this is ugly 2017-06-19 19:31:48 -04:00
lm40andGitHub 69c64c99e7 lol 2017-06-19 19:31:06 -04:00
lm40 9db294ae79 d 2017-06-19 19:20:27 -04:00
lm40andGitHub eb69d03d52 Adds antitoxin 2017-06-19 17:29:57 -04:00
lm40andGitHub 2502baaaab quick reagent fix 2017-06-16 11:49:02 -04:00
Verkister 5b753a5180 Does it still slap those goddamn item pictures on every hit? How do I make it not to! Blagh. 2017-06-15 00:05:22 +03:00
Verkister 4bab1168d9 :^↕ 2017-06-14 23:53:13 +03:00
Verkister e24faba491 A new dogborgo!
-Stole some virgo borgo modifications for them puppies.
-Added janiborgo dog.
-Nuked the fine balance with horribly abusable exploits :^)
-Y'all hubbie 4chog gamerkids can suck my egg.
-This update received Jay's blessing before I even started porting these.

(apparently had some older junk edits that tried to cram into the pr)
2017-06-14 23:18:44 +03:00
Verkister 4f3d39c693 A new dogborgo.
-Stole some virgo borgo modifications for them puppies.
-Added janiborgo dog.
-Nuked the fine balance with horribly abusable exploits :^)
-Y'all hubbie 4chog gamerkids can suck my egg.
-This update received Jay's blessing before I even started porting these.
2017-06-14 23:13:38 +03:00
Verkister da6cd22d13 Merge branch 'master' of https://github.com/Verkister/Citadel-Station-13 2017-06-14 17:38:56 +03:00
Artemiuz28andGitHub ceed94e67f Fixed femcum creating decal with semen reagent 2017-05-22 16:12:20 +03:00
Artemiuz28andGitHub c6e60fcc76 Vagina is now valid for masturbation 2017-05-22 16:11:07 +03:00
Artemiuz28andGitHub f0ed647ef4 Update womb.dm 2017-05-22 16:03:45 +03:00
kevinz000 de0131346a Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items
# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm
2017-05-21 18:17:42 -07:00
kevinz000 c58c6ffdd8 autoloading 2017-05-18 21:24:02 -07:00
PoojawaandGitHub 59b8cfbc93 Update cit_arousal.dm (#1027) 2017-05-18 08:38:46 -05:00
kevinz000 d557c03ca2 fix 2017-05-16 17:09:39 -07:00
kevinz000 da615b1440 h 2017-05-14 20:19:26 -07:00
kevinz000 e7c41603f0 new and improved 2017-05-14 19:22:52 -07:00
kevinz000 2c6cc491da right 2017-05-14 14:15:38 -07:00
kevinz000 d15b0b9606 stuff 2017-05-14 14:00:51 -07:00
kevinz000 25024432fe more procs and roundstart loading files 2017-05-13 16:23:43 -07:00
kevinz000 9e0866871e lists and stuff 2017-05-13 11:26:07 -07:00
kevinz000 29a3968f48 kinda_working 2017-05-10 03:41:01 -07:00
LetterJayandGitHub 3b8484b52b Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -05:00
TalkingCactusandGitHub fc9e2a46d6 fixes #618 (#675) 2017-05-01 05:29:35 -04:00
Verkister d06d99bc14 Disablesthe broken jizz/milk production for the time being.
-Cactus will fix eventually.
-Hopefully.
2017-05-01 00:05:03 +03:00
LetterJayandGitHub 06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
LetterJay 991fb8335c manual merge 2017-04-29 11:42:28 -05:00
LetterJay 7740e1bfee fix missing icon for the carbine 2017-04-27 14:33:41 -05:00
LetterJayandGitHub 417b80bb42 Merge pull request #516 from Verkister/master
Bringing back the dogborgos.
2017-04-26 06:24:26 -05:00
Verkister 265805afe6 Fixed dogborg pounce. 2017-04-26 13:27:36 +03:00
Verkister e563a60a8c Popped in a copy of the old gulp sound to fix a conflict. 2017-04-23 12:25:03 +03:00
Verkister ff414cf7fa Pounce is somewhat functional again.
-Drawback is that distance pouncing is borked. Borked out of box with tg hunters too?
-Removed stun time nerf to make up for the lack of distance functionality.
2017-04-23 11:50:39 +03:00
Verkister e5c87b0a0f Kinda figured out the slapping icon thingy.
-Yeah, the jaw hud icon still shows up at the bottom, but the bite effect now shows up and covers most of it.
-Also made the borg sleeper insertion use a gulp sound :v
2017-04-23 11:01:37 +03: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
TalkingCactus d4c249d1c4 fixes dildo and genital initialization 2017-04-21 12:18:23 -04:00
TalkingCactusandGitHub 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
ktccdandTalkingCactus 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
PoojawaandGitHub 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
LetterJayandGitHub d12a1d88a5 Revert "Huge Sprite Rework" 2017-04-04 16:34:55 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 2e285dff0b Merge pull request #335 from TaxMaster/VendingPartDuo
VG Vending 2: Free Market Boogaloo
2017-04-03 02:54:12 -05:00
TaxMaster c270dd2b72 Fixes
The comment in cit_uniforms was just to try and get an answer why icons
were vg_clothes.dmi
2017-04-02 18:37:39 -05:00
TalkingCactusandPoojawa 616ce57f26 Gas The Kayaks Raft War Now - Today at 10:07 PM please add a "cancel" button to the edit flavor text button (#333)
* we did it reddit

* hoopla
2017-04-02 18:35:31 -05: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
ktccdandTalkingCactus 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