TheDZD
4b610d8dda
Merge pull request #3758 from Fox-McCloud/remove-halloss
...
Removes Halloss
2016-03-05 22:39:19 -05:00
Fox McCloud
ab490f7fd9
Merge pull request #2903 from Aurorablade/OrganRefactor
...
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
2016-03-04 19:51:50 -05:00
Fox-McCloud
4d9627e986
Removes Halloss
2016-03-03 23:26:41 -05:00
Crazy Lemon
7e8a2ff237
Merge pull request #3732 from Fox-McCloud/sleeping-carp
...
Adds Sleeping Carp Scroll to Uplink
2016-02-29 06:36:28 -08:00
Tigercat2000
976887b2e0
Replace text2list and list2text
2016-02-28 12:07:19 -08:00
Fox-McCloud
84def6e144
Adds Sleeping Carp Scroll to Uplink
2016-02-28 02:08:32 -05:00
Tastyfish
aed9859b9a
Fixes a bunch of things to not circumvent SetStun/SetWeaken/SetParalyse that has no business doing so.
2016-02-28 01:11:36 -05:00
Aurorablade
9a804ebd31
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-24 06:27:16 -05:00
Crazylemon
da01814113
Completely tears out all uses of the 'update_icon' var in mobs
2016-02-23 21:55:03 -08:00
Aurorablade
d861d86edd
halp
...
open handed cavity item removal not working, help_shake_act seems to be
taking priotity, debrained sprite not appearing right on brain removal
2016-02-21 23:55:47 -05:00
Regen
097914386f
Adds item state
...
Also removed extra whitespace
2016-02-21 23:02:56 +01:00
Regen
f4ba151d33
oops
...
it's plasmatech, not plasma
2016-02-21 14:22:25 +01:00
Regen
8a6bedd028
Fixes
...
Fixes typo in the gun sprite, adds origin_tech and tweaks charge cost
2016-02-21 14:19:18 +01:00
Regen
2db5fec54a
Adds immolator laser gun
...
Adds an immolator laser gun, which has 7 shots and ignites the target.
http://puu.sh/nfys1/b381d812de.png
Will add more and better pictures tomorrow, but right now I need sleeps
2016-02-21 03:26:44 +01:00
Aurorablade
570dd619b7
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-18 19:01:41 -05:00
Aurorablade
29293dde10
look ma no brain
2016-02-17 22:03:02 -05:00
Fox-McCloud
f47131fbb2
Refactors Bot Weapon Identification
2016-02-12 14:52:50 -05:00
Aurorablade
545d3abf19
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-11 18:03:09 -05:00
Fox-McCloud
0561987ed8
Kinetic Accelerators Auto-Reload
2016-02-09 02:21:19 -05:00
VampyrBytes
18d7335f4e
Fixes #3497
...
Deathsquad pulse rifle now fires correct round type
2016-02-04 17:45:00 +00:00
Aurorablade
0fc841f0f9
can i sleep uyet
2016-02-03 00:40:10 -05:00
Aurorablade
6001f3d80c
ayyy merge conflicts fix
2016-02-02 20:46:38 -05:00
Aurorablade
25876fd036
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-02 15:35:54 -05:00
Fox-McCloud
1ff23cd3ca
lesser summon guns, wizman update
2016-01-29 09:12:37 -05:00
Aurorablade
53f410272a
home streach.
2016-01-26 20:53:13 -05:00
Aurorablade
42d8ac68b5
xeno organ fail still...
2016-01-22 22:01:24 -05:00
Fox-McCloud
31cf368706
Fixes Holstering a Few Guns
2016-01-20 18:39:45 -05:00
TheDZD
b1e6f7c0a8
Merge pull request #3157 from DaveTheHeadcrab/blueshitgun
...
Blueshield: Advanced Stun Revolver
2016-01-16 23:17:54 -05:00
Fox-McCloud
db90f5118b
Fixes Revolver Spin Runtime
2016-01-13 00:04:09 -05:00
FalseIncarnate
7b581a8150
Revolver Fixes
...
Fixes the revolver being named "revolver" instead of ".38 Mars Special"
(was an issue even before #2722 , but no one besides Fox seemed to
realize that due to the way the code was)
Fixes revolvers not actually getting the Spin verb to spin the chambers
as advertised in #2722
- verb and proc are similar, yet different.
2016-01-11 01:47:18 -05:00
Fox McCloud
a2f944cfd9
Merge pull request #2722 from ZomgPonies/russian
...
Revolver Stuff
2016-01-11 00:18:21 -05:00
Fox-McCloud
576eb179e1
Armory Tweak
2016-01-09 23:29:35 -05:00
TheDZD
82b12d1a34
Merge pull request #3164 from Fox-McCloud/uplink-fixes
...
Uplink and Syndicate Cyborg Fix
2016-01-08 17:28:40 -05:00
Fox-McCloud
a21d1b5221
Uplink and Syndicate Cyborg Fix
2016-01-08 17:07:33 -05:00
Fox McCloud
efbe361853
Merge pull request #3149 from DaveTheHeadcrab/friendlyfire
...
Adds Fun
2016-01-08 15:13:24 -05:00
SamCroswell
bffd71cce5
BS Revolver Fluff
2016-01-08 13:42:37 -05:00
Fox McCloud
6f70f7790f
Merge pull request #3139 from DaveTheHeadcrab/idedplsnerf
...
Tweaks .38 Rubber Bullet Damage
2016-01-08 00:44:39 -05:00
SamCroswell
0b69e3dfd7
I submit to overlord Fox!
2016-01-08 00:40:51 -05:00
SamCroswell
134e507ee6
Asset Protection Energy Gun
2016-01-08 00:27:51 -05:00
SamCroswell
96f7f48f32
Properly spells magazine
2016-01-07 15:17:44 -05:00
SamCroswell
eb8b2cc09f
Adds Fun
2016-01-07 15:08:12 -05:00
SamCroswell
68cfea1e7c
Reduces Detective's Revolver Damage
2016-01-06 21:43:09 -05:00
Fox-McCloud
ebdd9d3897
Timestop Spell Port and Sepia Slimes
2016-01-06 03:30:08 -05:00
Fox-McCloud
44d46bc456
map fix
2016-01-03 22:42:59 -05:00
Fox-McCloud
97527dddc6
tweak
2016-01-03 20:34:40 -05:00
Fox-McCloud
7830cd215b
shotgun
2016-01-03 04:03:48 -05:00
Fox-McCloud
eade350dc8
Sec Rifle Port
2016-01-02 01:06:37 -05:00
Fox McCloud
9d8c5ba4fc
Merge pull request #3003 from FalseIncarnate/master
...
Naughty List Revenge
2015-12-24 23:03:35 -05:00
Fox-McCloud
7ef528dcdc
Medibeam and Guardian Fixes
2015-12-24 11:28:40 -05:00
FalseIncarnate
c032781c7b
Naughty List Revenge
...
Santa has refused to deliver presents to the NSS Cyberiad for an unknown
reason.
Meanwhile, a distress beacon is received from the North Pole, on an
unencrypted Syndicate frequency. Apparently, Christmas Eve was anything
but a silent night.
A rogue operative seems to have infiltrated the North Pole and attempted
to coerce Santa into removing him from the Naughty List, but his plans
may have backfired. Santa has finally snapped, and must be put down in
order for the crew to receive their gifts this year.
The gateway has been reconfigured to lock onto the general location of
the distress signal, and will not lock on to any other destinations
until after Christmas has passed. Be warned, however, that the frozen
north is far from hospitable, and a variety of dangers await you beyond
the safety of the blast doors.
This mission will offer some new challenges, and is designed to be
undertaken by a squad of players. Will your team be able to put Father
Christmas to rest and rescue the presents, or will you meet your demise
in the freezing tundra?
2015-12-24 03:40:31 -05:00
