a92abcbb96
It's always the more extreme stuff you don't notice. Moved the damage check AFTER the check whether the head exists to begin with.
2019-05-18 21:40:43 +02:00
ed4c9506a7
Merge pull request #8388 from Useroth/collars-n-shit
...
Quick fix for the colorable collars. I've made the mistake of not testing code after applying a suggestion.
2019-05-18 08:30:10 -07:00
8ea639a5ac
Quick fix for the colorable collars.
2019-05-18 15:26:46 +02:00
6c077758c6
ports gang
2019-05-18 05:06:22 -04:00
28a1afa626
Properly adds NOGENITALS to species that wouldn't
2019-05-18 01:37:37 -05:00
20bbc0888d
Ling hivemind no longer turns apostrophes into '
...
Because They're not enjoying speaking gibberish for having proper grammar.
2019-05-18 17:42:17 +12:00
00356ce980
Cream pie smite
2019-05-18 17:09:26 +12:00
8b127387c6
Merge pull request #8344 from Trilbyspaceclone/patch-119
...
Makes sushie fucken have its correct subcat so we can craft it
2019-05-17 21:28:59 -07:00
20b27ea92c
Merge pull request #8362 from dtfe3/jetpack-stuff
...
Making the Improvised Jetpack recipe less confusing
2019-05-17 21:27:55 -07:00
50b6a610e9
Merge pull request #8303 from BurgerLUA/Vent-Clog-Fixes-And-Additions
...
Vent Clog Event Rebalance and Improvements
2019-05-17 21:27:32 -07:00
2a4a656a4d
Port new footsteps from tg
2019-05-17 18:10:03 -05:00
b3668a32d0
Fixes color of elf ears
...
Fixes color of elf ears
2019-05-17 20:29:43 +02:00
844fb13467
Merge pull request #8348 from Trilbyspaceclone/patch-123
...
Makes suitcases craftable
2019-05-17 08:36:20 -07:00
d2f7b961d9
Touch-up
2019-05-17 17:16:43 +02:00
0f54bf7471
Might as well format it a little more.
2019-05-17 17:09:10 +02:00
73c3e94946
A fixed oopsie.
2019-05-17 17:07:45 +02:00
4d75eca582
Well, that was surely an interesting thing to code.
2019-05-17 16:22:17 +02:00
022e8710f9
port TG#43799 for signallers
2019-05-17 06:21:26 -05:00
f95da1aae5
Heart Attacks will murder you now
...
Also sanity check for cursed heart overlay
2019-05-17 05:59:28 -05:00
0d02956144
Fixes simple mob vore toggle
2019-05-17 05:28:54 -05:00
4f75f68a5d
make hostile mobs gurgle people
2019-05-17 05:13:30 -05:00
267661e078
Tail Wagging
...
Makes it so nymphos will continue wagging their tails when booty or face slapped
2019-05-17 01:56:44 -04:00
276a6e9896
Merge pull request #8307 from Citadel-Station-13/kevinz000-patch-49
...
buff sleepy pens to quickly drain stamina after 10 seconds
2019-05-17 00:54:17 -04:00
cbac4b1daf
Merge pull request #8330 from Scorpion-117/master
...
This is an entire addition to put stargazers back into clock cult.
2019-05-17 00:13:35 -04:00
d855a7eb0d
Merge pull request #8332 from Useroth/collars-n-shit
...
Two new collar types (with lockable variants). All collars are now colorable a'la polychromic stuff.
2019-05-17 00:10:41 -04:00
06681790cd
...
2019-05-17 04:24:38 +02:00
0e9717845e
Update podpeople.dm
2019-05-16 19:03:32 -07:00
c69d9a38d7
Update podpeople.dm
2019-05-16 18:50:09 -07:00
88a41f7783
Update cult_items.dm
2019-05-16 19:54:08 -04:00
381a4869bb
Update cult_items.dm
2019-05-16 19:40:09 -04:00
a9eca3c143
Update clothesmate.dm
2019-05-16 15:51:46 -04:00
65dfca1c18
Update wardrobes.dm
2019-05-16 15:44:59 -04:00
ac04e23e31
Nympho Traiting & Arousal!
...
Butt slaps 2.0
Added nympho to defined traits, added arousal damage to ass slapping (arousal system needs to be enabled), and added forced orgasms to nymphos at max arousal
2019-05-16 10:17:16 -04:00
3ece75eb76
Makes the jetpack easier to craft
2019-05-16 15:30:46 +02:00
d228334cd5
Fix for the improvised jetpack
2019-05-16 15:19:59 +02:00
1e7b537166
Update code/modules/integrated_electronics/core/detailer.dm
...
Prettier list
Co-Authored-By: Useroth <37159550+Useroth@users.noreply.github.com >
2019-05-16 00:42:05 +02:00
c18756dec4
Well, that's it.
2019-05-15 23:24:12 +02:00
9e00562e68
Added custom option
...
Added custom option to the color selection
2019-05-15 13:13:17 +02:00
701b01dfa6
Just another commit to make travis fucking recompile it
2019-05-15 02:30:47 +02:00
8500e69088
Merge branch 'collars-n-shit' of github.com:Useroth/Citadel-Station-13 into collars-n-shit
2019-05-15 02:09:41 +02:00
3f64128513
Apply suggestions from code review
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-05-15 02:08:43 +02:00
6a29a0744b
Applied suggested changes.
2019-05-15 02:07:16 +02:00
f910eea9f8
Update code/modules/clothing/neck/_neck.dm
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-05-15 01:41:18 +02:00
7cd74e6601
Adds pink to the circuit coloring tool
2019-05-15 00:07:53 +02:00
a3114d830a
Merge pull request #8336 from BurgerLUA/Integrated-Circuit-Fixes-and-Additions
...
Adds Stun Circuit, Pneumatic Cannon Circuit. Makes Extinguisher and Smoke Reagent circuits work.
2019-05-14 13:48:54 -07:00
afaf15bc59
Booty Calls!
...
Added butt slaps
2019-05-14 10:29:04 -04:00
06ea7de46b
[S] Fixes a fairly huge vector for server crashes
2019-05-13 21:49:33 -04:00
41400ff94a
Update recipes.dm
2019-05-12 21:54:18 -04:00
90268dea1d
Update recipes.dm
2019-05-12 21:17:28 -04:00
34cb661211
Requested changes
2019-05-12 13:44:23 -07:00
Useroth