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
b5b54c9f9f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
2019-05-17 02:17:18 +02: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
0f6677b956
Blood colors happens to footprints now.
...
Different prints not working. splatter effect not working, I'm just sick of looking at this right now.
2019-05-16 08:23:53 -05:00
d228334cd5
Fix for the improvised jetpack
2019-05-16 15:19:59 +02:00
538c6e98ac
On-mob_life proc doesn't work for some reason. Fix it/badger helpers.
2019-05-16 01:26:46 +01:00
246a344fed
Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain)
2019-05-16 00:58:30 +01: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
6dba14eafd
Final fix.
2019-05-15 05:34:16 +01:00
2218956a09
Gearing up for PR
2019-05-15 05:27:09 +01: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
0d907db516
Almost done. Just need to update reagent vars.
2019-05-14 21:20:38 +01:00
76aec5a5ed
Holder fixes
2019-05-14 16:51:03 +01:00
afaf15bc59
Booty Calls!
...
Added butt slaps
2019-05-14 10:29:04 -04:00
77abf6a179
just need the stupid component to work properly now
2019-05-14 02:36:23 -05:00
06ea7de46b
[S] Fixes a fairly huge vector for server crashes
2019-05-13 21:49:33 -04:00
3229e4bf3a
Reverted holder, (sorry Kev)
2019-05-14 02:48:12 +01:00
be27417633
Stuff and things
2019-05-13 18:07:51 +01:00
050906bfe8
I know how to code I sware
2019-05-12 22:22:09 -04:00
e9a18f156f
Update engineering.dm
2019-05-12 22:03:21 -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
49a2f3cc63
I don't even fucking know anymore
2019-05-12 06:31:02 -05:00
1a047c0068
I think I got it.
...
Also gibs should be better too.
2019-05-12 04:06:35 -05:00
3e4412e171
Delete autolathe_designs.dm
2019-05-12 02:04:07 -04:00
62e5037eab
Merge branch 'master' into patch-118
2019-05-12 02:03:32 -04:00
db74544a7c
Create autolathe_designs.dm
2019-05-12 02:02:49 -04:00
9f3aa6de13
Merge pull request #8316 from Trilbyspaceclone/Lock_and_key
...
Better Locked Collar checks
2019-05-11 22:21:16 -07:00
4f12a762f3
Merge pull request #8342 from BurgerLUA/Cult-Improvements-and-Fixes
...
Adds EMP Defensive Traps to Clockcult
2019-05-11 22:19:46 -07:00
db99b595f3
Merge pull request #8331 from Useroth/dick-circuits
...
Dildo-shaped circuit assemblies. Because that's what the community needs.
2019-05-11 22:17:46 -07:00
36ee078e23
Merge pull request #8333 from Useroth/ayy-baton
...
Abductor baton buff. Because it currently sucks balls.
2019-05-11 22:17:27 -07:00
86e3992945
Merge pull request #8335 from Poojawa/quick-fiiiix-marking
...
Quick fiiiix marking
2019-05-11 22:16:37 -07:00
9b135ed56b
Merge pull request #8338 from Sishen1542/satchel-holding
...
Satchel of Holding!
2019-05-11 22:14:15 -07:00
4276f53338
Merge pull request #8341 from Trilbyspaceclone/golden
...
Golden toolboxes.
2019-05-11 22:13:18 -07:00
Useroth