kevinz000
|
1408a453de
|
Merge pull request #8591 from Ghommie/Ghommie-cit43
You smell that? Napalm, son.
|
2019-06-16 01:16:12 -07:00 |
|
kevinz000
|
12ecaf63ee
|
Merge pull request #8605 from Trilbyspaceclone/patch-174
Adds medical breifcases
|
2019-06-16 01:11:11 -07:00 |
|
kevinz000
|
5d8286f91c
|
Merge pull request #8640 from Trilbyspaceclone/more_cooking1
Makes baklava pie
|
2019-06-16 01:10:47 -07:00 |
|
kevinz000
|
8e10286fd6
|
Merge pull request #8484 from BlackMajor/Dunga
Adds bluespace compression kit and superglue
|
2019-06-16 01:10:25 -07:00 |
|
kevinz000
|
c6bdb74c6a
|
Merge pull request #8623 from Arturlang/RD_ROD_SUPLEX
RD can now suplex a immovable rod.
|
2019-06-16 01:08:48 -07:00 |
|
kevinz000
|
3f39e5a8bc
|
Merge pull request #8598 from Poojawa/patch-1
Fixes Gulag point rewards upon inserting sheets
|
2019-06-16 01:08:17 -07:00 |
|
kevinz000
|
4135bcfa77
|
Merge pull request #8639 from Useroth/ninja-shit
Ninja tweaks and improvements. Take two.
|
2019-06-16 01:03:34 -07:00 |
|
kevinz000
|
d3555d6782
|
Merge pull request #8243 from Trilbyspaceclone/meteor
More Meteor defenses
|
2019-06-16 01:01:43 -07:00 |
|
deathride58
|
88a8db87c2
|
Merge pull request #8612 from BlackMajor/Ooga
Makes a small adjustment to the ash walker camp.
|
2019-06-15 21:29:55 -04:00 |
|
deathride58
|
fdc0e4f957
|
Merge pull request #8611 from Poojawa/digitigrade-socks
Digitigrade socks
|
2019-06-14 20:50:05 -04:00 |
|
deathride58
|
b1f1b2a57d
|
Merge pull request #8609 from Poojawa/simple_mob_nomming-I-guess
Client check to possibly fix #8542
|
2019-06-14 20:49:28 -04:00 |
|
deathride58
|
d79a58b3f4
|
Merge pull request #8634 from Ghommie/Ghommie-cit46
fixes low-charge stunbatons & co.
|
2019-06-14 20:44:19 -04:00 |
|
Ghommie
|
a3c2ed0b52
|
fixes.
|
2019-06-15 02:19:57 +02:00 |
|
deathride58
|
2f47fbdd8b
|
Merge pull request #8628 from BlackMajor/Pie
Cream Pies now transfer a portion of their reagents on hitting someone
|
2019-06-14 19:18:12 -04:00 |
|
Trilbyspaceclone
|
f32291146b
|
Update all_nodes.dm
|
2019-06-14 12:02:55 -04:00 |
|
Trilbyspaceclone
|
c5e3010cfa
|
Update misc_designs.dm
|
2019-06-14 12:01:52 -04:00 |
|
Useroth
|
ec1ff9ada3
|
The joy of making an error in a webedit.
|
2019-06-14 13:05:36 +02:00 |
|
Useroth
|
bd35b8696c
|
Another commit to get fucking Travis going.
|
2019-06-14 12:52:03 +02:00 |
|
Arturlang
|
fb150c355e
|
Merge pull request #1 from Arturlang/master
hopefully this works to fix travis
|
2019-06-14 11:47:14 +03:00 |
|
TrilbySpaseClone
|
1c45e2c615
|
Suggested
|
2019-06-13 16:02:48 -04:00 |
|
Useroth
|
3f4d9319e9
|
Update energy_net_nets.dm
|
2019-06-13 20:38:22 +02:00 |
|
Useroth
|
e3acef755a
|
Fuck you again, Travis. Do it right this time.
|
2019-06-13 20:33:45 +02:00 |
|
Useroth
|
bab2ec4789
|
Travis, I fucking mean it. Compile it.
|
2019-06-13 15:46:12 +02:00 |
|
Useroth
|
5e90c530e0
|
Travis, you whore, compile it properly.
|
2019-06-13 15:37:18 +02:00 |
|
Useroth
|
2d977becb5
|
Finally fixed the net breaking mechanics.
|
2019-06-13 15:27:57 +02:00 |
|
Useroth
|
39bedb8341
|
Update ninjaDrainAct.dm
|
2019-06-13 15:27:56 +02:00 |
|
Useroth
|
ee661d1eb8
|
An afterthought regarding healing/reviving the capturees.
|
2019-06-13 15:27:56 +02:00 |
|
Useroth
|
35fe334fe8
|
Small tweak.
|
2019-06-13 15:27:56 +02:00 |
|
Useroth
|
231da023ec
|
Makes the gloves actually stun people.
|
2019-06-13 15:27:55 +02:00 |
|
Useroth
|
df15e53cd3
|
Another attempt at the nets not being breakable with bare hands. Now with more consideration.
|
2019-06-13 15:27:55 +02:00 |
|
Useroth
|
2e5ad2f4d8
|
Might as well crank it up a little more.
|
2019-06-13 15:27:55 +02:00 |
|
Useroth
|
7fd2c60992
|
Makes energy nets a bit sturdier and unbreakable with bare hands.
|
2019-06-13 15:27:54 +02:00 |
|
Useroth
|
04a1c7ada4
|
Energy net and capture objective tweak.
|
2019-06-13 15:27:54 +02:00 |
|
Useroth
|
f9c249b644
|
Energy net tweak to make it less clunky to use.
|
2019-06-13 15:27:54 +02:00 |
|
Arturlang
|
44be4ea7b4
|
Reviewers suggestions
|
2019-06-12 23:58:54 +03:00 |
|
Ghommie
|
4cc7636da1
|
fixing more.
|
2019-06-12 22:50:09 +02:00 |
|
BlackMajor
|
142d62908f
|
Actually make it 15, the pie starts with 13u already used
|
2019-06-12 21:18:56 +12:00 |
|
BlackMajor
|
7b79bbcb29
|
Changes transfer amount to 10u instead of the full 80
|
2019-06-12 21:17:31 +12:00 |
|
BlackMajor
|
90e572ec03
|
Honk
|
2019-06-12 20:03:17 +12:00 |
|
kevinz000
|
54b3568319
|
Merge pull request #8599 from Poojawa/pacifistic-vore
Pacifists can nom things now, but not feed to others
|
2019-06-11 11:13:01 -07:00 |
|
kevinz000
|
d2b40ea73d
|
Merge pull request #8610 from Sishen1542/fingerlessinsuls
Changes assistant family heirloom to a pair of fingerless insulated gloves
|
2019-06-11 11:03:56 -07:00 |
|
kevinz000
|
6ead9bbe65
|
Merge pull request #8587 from SkullyRoberts/DickImplant
Added a single use penis autosurgeon as rare maint loot. Because why the hell not?
|
2019-06-11 10:56:44 -07:00 |
|
unknown
|
80eb813a07
|
RD can now suplex a rod. Good fucking luck.
|
2019-06-11 18:53:17 +03:00 |
|
unknown
|
355e384ba1
|
Spacing fixes
|
2019-06-11 14:31:27 +03:00 |
|
unknown
|
9219401154
|
Doneso
|
2019-06-11 14:24:16 +03:00 |
|
BlackMajor
|
7523c86071
|
Wasn't I supposed to do this in January
|
2019-06-10 22:55:38 +12:00 |
|
Poojawa
|
d8dbad6e2e
|
Digitigrade socks
|
2019-06-10 04:47:07 -05:00 |
|
Sishen
|
9f80fbe68b
|
Coloring gloves? Not on my watch!
|
2019-06-10 05:20:54 -04:00 |
|
Sishen
|
4eccc12205
|
Why are we here? Just to suffer?
|
2019-06-10 04:56:24 -04:00 |
|
Poojawa
|
17629d4feb
|
client check I guess
|
2019-06-10 03:28:56 -05:00 |
|