Commit Graph

136 Commits

Author SHA1 Message Date
LetterJay
8cb93a512c Merge pull request #2907 from Michiyamenotehifunana/wave2ofguns
Wave 2 of guns
2017-09-24 11:32:41 -04:00
LetterJay
f8eef1755f oops 2017-09-23 10:09:59 -05:00
LetterJay
d25746fd66 donations items 2017-09-23 10:07:15 -05:00
Michiyamenotehifunana
05bbc43782 Wave 2 of guns
Spinfusor, X9, Magpistol.
2017-09-23 15:05:11 +08:00
LetterJay
5b38d23bfd oops 2017-09-21 02:28:37 -05:00
LetterJay
bb837fe20e donation item 2017-09-20 04:57:57 -05:00
Michiyamenotehifunana
1f84944dee Anti Tank Pistol Improvements and Implementation
Fixes the issues with the ATP, modifies its sprite slightly, and adds it to the nukeops uplink list.
2017-09-18 23:11:14 +08:00
Michiyamenotehifunana
fb8128d934 Adds Anti Tank pistols
Due to balance concerns and unironed out bugs, adminspawn only.
2017-09-17 21:38:57 +08:00
Poojawa
15db46af10 Update dogborgstuff.dm
removes PAI from protected, add bomb cores. christ people are memes.
2017-09-16 08:22:50 -05:00
Poojawa
0eb8cf0235 Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning (#2759)
* In hands of plasma weapons/tweaks

* Icon override states for all clothes

* a few compile issues ~

* Adds a new badmin button and plasma rifle case

* better cleanup of the sound effect

* Oh, these should've been deleted already.
2017-09-16 04:29:22 -05:00
LetterJay
6c754246e5 carrot plushie 2017-09-13 20:58:35 -05:00
LetterJay
39687189b6 donation 2017-09-11 22:47:27 -05:00
Poojawa
50cd75df7d Actually makes Citadel reagents process (#2653) 2017-09-08 06:55:19 -05:00
LetterJay
eee21d496d oops 2017-09-07 07:23:52 -05:00
LetterJay
b5d80219ac donation item 2017-09-07 07:21:42 -05:00
LetterJay
bbab9d8d5a donation 2017-09-06 14:41:35 -05:00
LetterJay
cf46abecb3 Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004
[MIRROR] Moved emagged var to obj/item parent.
2017-09-06 09:15:11 -05:00
LetterJay
f5e8e06041 Update dogborgstuff.dm 2017-09-06 09:04:33 -05:00
LetterJay
f8413517bb testing 2017-09-02 07:43:34 -05:00
LetterJay
98da910178 Update read_from_file.dm 2017-09-01 11:21:50 -05:00
kevinz000
e8bb79d7c9 kk 2017-09-01 07:12:08 -07:00
kevinz000
ddb49cd1ca kek 2017-09-01 06:58:31 -07:00
kevinz000
b193d77c1c hm 2017-09-01 03:36:18 -07:00
kevinz000
62a358574c sync 2017-08-29 02:37:34 -07:00
kevinz000
3254fcf535 goddamnit_again (#2511) 2017-08-26 18:43:57 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
ktccd
45285ef491 Fixes a lot of problems in dogborg code (#2471)
List of things I fixed:
old << style messages didn't do crap, replaced with to_chat
Medidog now respects your vore preferences also.
K9 referenced the wrong type of sleeper unit by name, fixed now.
All do_after checks now also have a check for distance once the timer is
up.
All do_after checks now properly sets target = <thing to target>. This
is probably making the previous thing on the list redundant, but an
extra sanity check isn't a bad idea... I think?
2017-08-24 18:36:13 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458)
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
kevinz000
365b16e298 saving work 2017-08-21 19:47:23 -07:00
ktccd
5731ea7cad Climaxing/masturbation changes, exposing through clothing, breastmilk and masturbation (#2357)
* Genital refactoring and masturbation rework

Refactors a lot of genitalia code.
Reworks masturbation code.
Adds the ability to expose onself through clothing (Still bugfixing it).

* Fixes it so everything works

Toggling exposing your genitals now works properly. You can now expose
genitals through clothing.
Genitalia is rendered a bit more modularly and less hardcoded.
Genitalia no longer has linked_penis and such, but instead linked_organ.
More variables made general for genitals.
Breasts can now be used to masturbate and climax, also letting you fill
beakers and others with milk.
Both being pulled and pulling someone can let you count them as a
partner for climaxing verbs.
Mob_climax split up into more sub-procs.
Hexacrocin made less verbose, and not as spam-happy with forced orgasms.
Hexacamphor also made less verbose.

* Removes outcommented code

Forgot to remove the old masturbation code that I commented out.

* Changes one tab further on line 248

As pointed out to me ^^.

* Climaxing with partner tabulation

Also copied the command for the spillage version.

* capitalisation and timers

Removed timers from forced climaxes and made it a default value
parameter instead, so it's adjustable.
Changed capitalisation of genitals and the mentions of them now use the
.name to avoid including a "The" in the mention.

* I accidentally runtimestation

Accidentally committed changing the map to runtimestation when I
debugged my code.
Changed it back to basemap now.
2017-08-19 19:01:02 -07:00
kevinz000
630a4a7bc7 parsing from file work, still working on mobloading. 2017-08-11 13:05:12 -07:00
ktccd
9ef1825ee0 Adds Taur cocks (#2329)
* Added flared taur penises

FIRST STEP ONLY DO NOT PULL REQUEST THIS!!!!
The files are still messy and the penis is just another shape to choose
from right now for testing purposes!
Flipped the order of GENITALS_BEHIND_LAYER and BODY_BEHIND_LAYER, as
taurs need to be drawn on top of the genitalia, and I don't think
anything else uses this that would need genitals drawn on top of them.

* Adds More shapes

Adds Tapered and Knotted shapes to the Taur cocks.

* Fixes on-ground sprites

The OLD bug barbed knotted cocks being invisible when not inside a body
is fixed.
This fix solves why taur cocks were invisible when cut off or gibbed the
body.
This also removes the lowershape() workaround that was being used.
I'll get around a bigger refactor of other genitalia in another PR, as
the scope of this was just to add taur cocks to begin with...
2017-08-11 12:29:01 -07:00
kevinz000
f91d7799f4 Merge branch 'master' into custom_roundstart_items 2017-08-09 09:46:52 -07:00
ktccd
9e71a0bdb1 Lots of genital changes
Penile masturbation is fixed again.
Masturbation cooldown set to 5 seconds once again, as intended.
mob_masturbate is now mob_climax(forced_climax=FALSE). It can be used to
masturbate alone, cum inside someone partially or completely and can be
used to trigger a forced orgasm through all eligible genitals.
Hexacrocin (Aphro PLUS) now increases your minimum arousal over time
when overdosing, up to your maximum arousal level at which point you are
constantly aroused.
When fully aroused, hexacrocin overdose will force an orgasm.
Hexacamhor (ANaphro PLUS) overdose now decreases minimum arousal over
time, down to 0.
Added to_chat feedback to the player when their libido changes
permanently.
Changed old "src <<" messages to use the new to_chat in citadel chems
and citadel arousal, so text should display now.
Changed names of genitals to be capitalized, to avoid the code
automatically calling them "The X".
Masturbation also has more helpful feedback messages when you lack the
correct organs.
The old force_orgasm proc is removed, use mob_climax(forced_climax=TRUE)
instead.
2017-08-08 17:41:27 +02:00
ktccd
a91b3b0f19 Citadel chem fixes (#2134)
* Adds taste to citadel reagents

No longer will semen, femcum and the rest taste like [Generic Food],
instead they will taste like... stuff!
If you got a better description for this, I'd like to hear it. Except
making personalized tastes or food-dependent tastes is way beyond the
scope of this PR.

* Fucked up committing

Somehow this didn't follow the rest of the committ, somehow...
2017-07-25 15:27:33 -07:00
kevinz000
dc50c1f4c0 Merge remote-tracking branch 'Citadel-Station-13/master' into Citadel-Station-13/custom_roundstart_items 2017-07-24 04:13:54 -07:00
kevinz000
97f6bf4410 character separation wip 2017-07-24 04:12:17 -07:00
ktccd
49bae2e207 Re-enables slime emote
Re-enabled the custom slime emote in a way that should hopefully dodge
any TG synchs removing it again in the future? Maybe?
2017-07-20 23:33:26 +02:00
deathride58
d21260d480 Makes arousal meter invisible when arousal is disabled (#2028)
* makes arousal meter invisible when arousal is disabled

* sets the appearance of the arousal meter when the hud is generated

* hm

* hopefully fixed

* cmon

* okay NOW it works. it 100% works
2017-07-17 22:50:52 -07:00
kevinz000
df590fd8c1 Merge remote-tracking branch 'Citadel-Station-13/master' into Citadel-Station-13/custom_roundstart_items 2017-07-16 20:30:27 -07:00
lm40
80d06fe843 Update dogborgstuff.dm (#2013) 2017-07-14 21:35:22 -07:00
TalkingCactus
cb5247d060 Fixes Gamemode Voting & Map Edits (#1937)
* fixes roundtype voting

* keg spawner

* maint bar to box and kinkmates to delta+meta
2017-07-07 17:54:53 -04:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
Poojawa
36a1898bde Dogborg balance tweaks (#1805)
* Update dogborgstuff.dm

* Compile fixes

* minor code standards tweaks
2017-07-05 10:01:57 -05:00
lm40
bac7abb9d6 this is ugly 2017-06-19 19:31:48 -04:00
lm40
69c64c99e7 lol 2017-06-19 19:31:06 -04:00
lm40
9db294ae79 d 2017-06-19 19:20:27 -04:00
lm40
eb69d03d52 Adds antitoxin 2017-06-19 17:29:57 -04:00