Ghommie
|
6f2b316b30
|
Oh yea, ghost seizure fix.
|
2019-06-17 00:40:51 +02:00 |
|
Ghommie
|
b2d82bd1f1
|
Applying upstream fixes.
|
2019-06-17 00:27:07 +02:00 |
|
Ghommie
|
b782226900
|
ports "Componentizes orbiting"
|
2019-06-17 00:19:57 +02:00 |
|
Thalpy
|
98fc55e9f8
|
Merge branch 'master' into Wheelchairs
|
2019-06-16 17:33:57 +01:00 |
|
Trilbyspaceclone
|
5716ea7a4b
|
Update shields.dm
|
2019-06-16 10:22:07 -04:00 |
|
kevinz000
|
89dd3d4e87
|
Merge pull request #8657 from BlackMajor/Dunga
HAHA WHOOPS I ACCIDENTALLY NUKED IT
|
2019-06-16 03:11:26 -07:00 |
|
BlackMajor
|
979455d86a
|
HAHA WHOOPS
|
2019-06-16 22:10:00 +12:00 |
|
kevinz000
|
4da303e64c
|
Update RCD.dm
|
2019-06-16 02:26:53 -07:00 |
|
kevinz000
|
6149a44408
|
Merge pull request #8565 from SkullyRoberts/NudityPermit
Ported the nudity permit from RP and made it a loadout option. You're welcome, Everoth
|
2019-06-16 01:19:51 -07:00 |
|
kevinz000
|
b0264414b2
|
Merge pull request #8576 from Sishen1542/whipcrack
Whips are long again (except yours, curator)
|
2019-06-16 01:18:37 -07:00 |
|
kevinz000
|
1408a453de
|
Merge pull request #8591 from Ghommie/Ghommie-cit43
You smell that? Napalm, son.
|
2019-06-16 01:16:12 -07:00 |
|
kevinz000
|
1c46bcef7e
|
Merge pull request #8479 from Ghommie/Ghommie-cit21
Krav maga leg sweep tweak.
|
2019-06-16 01:13:08 -07:00 |
|
kevinz000
|
9c0cc52771
|
Merge pull request #8600 from Sishen1542/plushsalt
Makes plushies not a 2% prize from the arcades
|
2019-06-16 01:11:37 -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 |
|
BlackMajor
|
0294cba855
|
Merge pull request #8213 from Citadel-Station-13/kevinz000-patch-33
shuttle purchase announcements are no longer delayed by mapload's blocking proccall
|
2019-06-16 20:09:15 +12: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 |
|
BlackMajor
|
5c99bbbd45
|
Undoing first step into scaling damage for fullmerge reasons
|
2019-06-16 20:00:31 +12:00 |
|
Ghommie
|
b5e3da68bd
|
Ports "areas_in_z after start population fix"
|
2019-06-16 08:45:37 +02:00 |
|
Trilbyspaceclone
|
c0d3ddceeb
|
Update uplink_kits.dm
|
2019-06-15 22:59:24 -04: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 |
|
BlackMajor
|
9219a2c813
|
Adding more ruins
|
2019-06-15 21:17:34 +12:00 |
|
BlackMajor
|
4528384976
|
Fuck it lets add way more spiciest PR
|
2019-06-15 19:03:04 +12: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
|
4e886c5b48
|
Merge pull request #2 from Arturlang/master
travis fix
|
2019-06-14 11:53:00 +03:00 |
|
Arturlang
|
fb150c355e
|
Merge pull request #1 from Arturlang/master
hopefully this works to fix travis
|
2019-06-14 11:47:14 +03:00 |
|
Ghommie
|
cf56870b57
|
Fixes the sacrificial target icon not displaying on the cult objective alert.
|
2019-06-13 23:48:15 +02: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 |
|