Crazy Lemon
2a0733a008
Merge pull request #9151 from Fox-McCloud/pistol-change-loot
...
Stechkin Maintenance Pistol Change
2018-07-06 18:12:29 -07:00
tigercat2000
fcdb0fe54b
Merge pull request #9172 from Fox-McCloud/no-lances
...
Removes Explosive Lances
2018-07-06 15:01:07 -07:00
Kyep
fa89130c5c
fixes naked outfit
2018-07-06 06:32:28 -07:00
tigercat2000
9697bd082f
Merge pull request #9171 from Citinited/jon-is-no-longer-custom
...
Fixes spelling error
2018-07-03 15:47:57 -07:00
Fox McCloud
319a6cd500
Removes Explosive Lances
2018-07-03 18:13:51 -04:00
Crazy Lemon
c100cdbf8b
Merge pull request #9167 from alexkar598/signs
...
Prevents sign duplication
2018-07-03 12:49:34 -07:00
Crazy Lemon
fc60131d5d
Merge pull request #9166 from alexkar598/this-will-burn-ais-down-to-the-ground
...
Ais can no longer be on fire
2018-07-03 12:47:38 -07:00
Crazy Lemon
bd7540a3f9
Merge pull request #9159 from MINIMAN10000/pod-eject
...
Restrained spacepod passenger can now exit pod after 2 minutes
2018-07-03 12:05:04 -07:00
Citinited
a7dc1d70e9
Fixes speling error
2018-07-03 16:30:30 +01:00
alexkar598
c391e4d823
you want those true and false?
2018-07-02 15:37:14 -04:00
alexkar598
7fafde8102
Update ai.dm
2018-07-02 15:32:41 -04:00
alexkar598
a15ae140f2
Signs are pointing me that there will be a clone arm-oh wait...the signs were just exploited by the clown and duplicated
2018-07-02 15:15:58 -04:00
alexkar598
dc47c9d62b
IT burnnnns
2018-07-02 14:40:03 -04:00
MINIMAN10000
17a4d52101
not do_after, not equal concious, warn pilot if there is one
2018-07-02 11:09:35 -07:00
MINIMAN10000
288c16df1b
Restrained spacepod passanger can now exit pod after 2 minutes
2018-07-02 00:38:06 -07:00
Fox McCloud
9eefe326c8
Merge pull request #9140 from Crazylemon64/mmi_radio_upgrade
...
MMI radio upgrade
2018-07-01 22:19:18 -04:00
Crazy Lemon
9771b0e9fd
Merge pull request #9157 from Citinited/canister-cooldown
...
Adds cooldown to hitting canisters
2018-07-01 18:26:04 -07:00
Citinited
0c7af8f281
Adds cooldown to hitting canisters
2018-07-02 00:38:34 +01:00
tigercat2000
76aefc59df
Merge pull request #8963 from FalseIncarnate/fluff
...
E.L.O. Fluff 2
2018-07-01 15:04:39 -07:00
Crazy Lemon
66fdbf25f8
Merge pull request #9155 from Fox-McCloud/fix-the-thing
...
Ragin' Mages Spell Cast Fix
2018-07-01 14:08:36 -07:00
Crazy Lemon
9aebedef0a
Merge pull request #9024 from Anasari/LongWar
...
Add 3000 more delay to shuttle (5 minutes) on war declaration
2018-07-01 13:48:53 -07:00
Fox McCloud
e05594f5b5
Ragin' Mages Spell Cast Fix
2018-07-01 16:45:44 -04:00
Crazy Lemon
3ca333d666
Merge pull request #9040 from Anasari/CryoLog
...
Cryo Logging PR
2018-07-01 00:47:39 -07:00
Anasari
dc5d384380
Moar fix
2018-07-01 15:21:23 +08:00
FalseIncarnate
5823b354df
merge conflicts
2018-07-01 02:42:31 -04:00
Crazy Lemon
3975a7d0f7
Merge pull request #8999 from Citinited/somebody-toucha-ma-spaghett
...
Adds macaroni cheese (pizza)
2018-06-30 22:11:05 -07:00
Crazy Lemon
bdaa1813a2
Merge pull request #9149 from datlo/master
...
Clown Magboots
2018-06-30 22:08:29 -07:00
Crazy Lemon
f1fc9375f5
Merge branch 'master' into LabelerLogging
2018-06-30 20:19:53 -07:00
Fox McCloud
6c9f83f685
Stechkin Maintenance Pistol Change
2018-06-30 19:24:56 -04:00
Crazy Lemon
7d61c7f32d
Merge pull request #9047 from Citinited/conveyor-belt-placer
...
Adds the conveyor belt placer
2018-06-29 21:11:49 -07:00
datlo
69779717fa
Cut code duplication, added sprites
...
Added a new variable to magboots called slowdown_passive, letting you
set how much the magboots slow you down when not activated, by default
SHOES_SLOWDOWN (same behaviour as before). Clown magboots use
SHOES_SLOWDOWN+1, same speed as clown shoes.
Removed redefinition of toggle as the magboots can now use the original
toggle properly.
Removed var/footstep which was copy pasted from the original clown
shoes, as far as I can tell it is not used or checked anywhere and
removing it does not silence squeeks or change any other behaviour.
Added sprites for the item icon and the mob's shoes when activated and
deactivated (adds a little red light that can be seen by a keen eye when
the shoes are activated)
2018-06-29 20:22:22 +02:00
datlo
ff591585c6
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
2018-06-29 18:45:55 +02:00
Crazy Lemon
2707c022ec
Merge pull request #9141 from R1f72r/Highfive
...
Change the High-five emote time frame from 2.5 seconds to 4 seconds
2018-06-28 11:10:08 -07:00
datlo
8a909e4da5
Clown Magboots V2
...
changed syndi description and fixed my accidental reverts sorry for the
commit spam I still stuck at github
2018-06-28 12:10:22 +02:00
datlo
0100f679b0
Revert "Clown Magboots V1"
...
This reverts commit 38d0c3652c
2018-06-28 12:03:11 +02:00
datlo
c7392d2d54
Revert "woops"
...
This reverts commit 06eeae5b06
2018-06-28 12:03:06 +02:00
datlo
31ff0cd6e4
Revert "Revert "woops""
...
This reverts commit cab9162d18
2018-06-28 11:42:06 +02:00
datlo
cab9162d18
Revert "woops"
...
This reverts commit 06eeae5b06
2018-06-28 11:40:21 +02:00
datlo
06eeae5b06
woops
...
missed a couple of lines
2018-06-27 23:42:24 +02:00
datlo
38d0c3652c
Clown Magboots V1
...
Item created, added to uplink
2018-06-27 23:39:17 +02:00
Anasari
9cf8bd06c3
Fix, again
2018-06-27 21:39:19 +08:00
Anasari
02a0670826
Oops
2018-06-27 21:06:22 +08:00
Fox McCloud
bfac50ef12
Merge pull request #9114 from MINIMAN10000/Fix-Emitters
...
Fix emitters
2018-06-26 22:29:55 -04:00
Citinited
e73ce56370
crazylemon tweaks
2018-06-26 22:18:27 +01:00
Anasari
5a09245029
Change to attack logs. Use ATKLOG_ALL
2018-06-26 16:47:09 +08:00
Anasari
6c8bba3f63
Merge branch 'master' into CryoLog
2018-06-26 16:24:29 +08:00
Crazy Lemon
39eee98526
Merge pull request #9111 from Allfd/spacenurf
...
Add space check to atmos throwing
2018-06-26 00:05:28 -07:00
R1f72r
c38783af57
Update neutral.dm
2018-06-25 07:32:38 -04:00
MINIMAN10000
6a8a1e9dbc
Removed redundant src.
2018-06-25 00:47:10 -07:00
Crazylemon64
be4a1e426d
Adds a radio MMI upgrade module, printable in the mech fab
...
Can be uninstalled with a screwdriver
2018-06-24 13:32:36 -07:00
