eca3edfec3
LIMBSTUMPS
2016-02-09 18:32:40 -05:00
3b90cb703a
almost ready for review
2016-02-08 01:16:13 -05:00
e5f5b68c92
fixed slime surgery
2016-02-07 00:54:46 -05:00
e1899e4af9
almost
2016-02-06 18:42:26 -05:00
12b3ccb2e2
why
2016-02-04 23:57:11 -05:00
0fc841f0f9
can i sleep uyet
2016-02-03 00:40:10 -05:00
6001f3d80c
ayyy merge conflicts fix
2016-02-02 20:46:38 -05:00
25876fd036
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-02 15:35:54 -05:00
276e5a0c74
Merge conflicts GO
2016-02-02 15:34:59 -05:00
e926935703
onward to merge conflicts!
2016-02-02 02:57:39 -05:00
78d40c3f87
Merge pull request #3449 from VampyrBytes/bugfix( #3414 )
...
Fixes #3414
2016-02-02 00:00:55 -05:00
0d9f2da748
Merge pull request #3462 from KasparoVy/Masks-For-BIGNOSE
...
Sharing is Caring: Masks Galore
2016-02-01 23:55:25 -05:00
aa4e1eb970
Sharing is Caring: Masks Galore
...
Adds Vox versions of the Officer SWAT sechailer + HOS SWAT sechailer + Warden SWAT sechailer.
Adds versions of the following, re-sprited to fit Unathi, Tajara and Vulpkanin:
Balaclava, up and down state
All bandana colours (+ skull pattern), up and down states
Breath mask, up and down state
Clown mask+wig
Cyborg mask
Death Commando mask
Gas mask
All wrestling masks
Medical mask, up and down state
Mime mask
Owl mask
Plague doctor mask
Ninja mask
Sechailer, up and down state
Sexy Clown mask+wig
Sexy Mime mask+wig
Sterile/Surgical mask, up and down state
SWAT mask
Welding gas mask, visor up and down state
Officer SWAT sechailer + HOS SWAT sechailer + Warden SWAT sechailer
All smokeables re-positioned so non-humans aren't smoking through their cheek.
Also fixes some typos, does a tiny bit of cleaning and gives the Warden their sechailer.
The sprite was just laying around, it seems.
2016-02-01 17:49:37 -05:00
3e7f1e7499
removes unneeded srcs
2016-02-01 10:26:52 +00:00
509e4cad02
Merge pull request #3461 from Tastyfish/suicide-squish
...
Better species suicide support
2016-02-01 01:54:49 -05:00
1b94a5b0b3
Merge pull request #3448 from VampyrBytes/Bugfix-( #3425 )
...
Fixes #3425
2016-01-31 19:16:36 -05:00
4ece68aeed
Merge pull request #3437 from Crazylemon64/syndicate_borg_access
...
Re-adds remote syndicate borg access to places
2016-01-31 18:45:58 -05:00
b3e7e9595b
Better species suicide support
2016-01-31 00:41:33 -05:00
c714f14b28
Shuttle fixes
2016-01-30 22:29:42 -05:00
c4d151ce34
you buy organ, yaya?
...
Is fresh.
2016-01-30 21:37:55 -05:00
c2d791a40a
Merge pull request #3440 from Crazylemon64/skrell_liver
...
Skrell's alcohol weakness is tracked on the liver
2016-01-30 21:21:51 -05:00
26085be1f8
Merge pull request #3439 from Crazylemon64/squishy_limbs_squish
...
People with squishy limbs can now squish
2016-01-30 21:21:30 -05:00
5f5c0e093a
Merge pull request #3435 from FalseIncarnate/master
...
Magic Eight Ball
2016-01-30 19:11:39 -05:00
7027c217bf
Some items has plasma typo in origin tech
2016-01-30 15:04:33 -05:00
1a512ccf76
Fixes #3414
...
reset's hud warnings during species change so they don't get stuck on
2016-01-30 09:05:29 +00:00
bb15d5f133
Fixes #3425
...
There were a couple of things going on... the spawn(-1) which should
have meant that the door shut straight away was being negated by the
sleeps. Also, If the door had just been used, it would still be marked
as operating and so wouldn't shut
2016-01-30 08:49:56 +00:00
50d77408f6
Merge pull request #3444 from Fox-McCloud/explosion-damage-refactor
...
Refactors Human Explosion Damage
2016-01-29 23:07:45 -05:00
500cc7b12a
apparently, this is a thing
2016-01-29 21:51:09 -05:00
868504bdc4
Merge pull request #3430 from Fox-McCloud/liches
...
Adds in Lichdom and Lesser Summon Guns Spells--Wiz Tweaks
2016-01-29 21:47:10 -05:00
1321158fbf
Refactors Human Explosion Damage
2016-01-29 21:45:57 -05:00
0ef973b37e
People with squishy limbs can now squish
2016-01-29 10:51:07 -08:00
1ff23cd3ca
lesser summon guns, wizman update
2016-01-29 09:12:37 -05:00
7267f890f6
Re-adds syndicate borg access to places
2016-01-28 23:48:00 -08:00
6a904adc1b
Merge pull request #3436 from Crazylemon64/vox_sprite_fix
...
Fixes voxxy sprite bug! Yaya!
2016-01-29 02:13:06 -05:00
b47b7063dc
Fixes voxxy sprite bug! Yaya!
2016-01-28 23:07:00 -08:00
98dfd5f90d
Magic Eight Ball
...
Adds in a new toy: Magic Eight Ball!
- Discern your fate with the wondrous Magic Eight Ball!
- Obtainable from Claw Game prize balls
Adds in the mighty MAGIC CONCH SHELL.
- Submit to the will of the all-knowing Magic Conch.
- Admin-spawn only (too powerful)
2016-01-28 23:40:37 -05:00
9072a7075d
Skrell's alcohol weakness is tracked on the liver
2016-01-28 20:17:00 -08:00
70804d49fc
Fixes plants attempting to sting ghosts
...
Fixes #3427
2016-01-28 21:38:54 -05:00
cfa857cd35
Adds in Lichdom Spell
2016-01-28 18:57:00 -05:00
3c35269615
Merge pull request #3417 from Fox-McCloud/spoopy
...
Adds in Skeleton Race
2016-01-28 16:02:18 -05:00
9a2a307ad7
Merge pull request #3426 from Crazylemon64/astral_rune_fix
...
Having many runes on the same tile will not break astral project
2016-01-28 02:52:46 -05:00
0c92ebd701
Having many runes on the same tile will not break astral project
2016-01-27 23:32:57 -08:00
dcac23cd46
Merge pull request #3393 from Fox-McCloud/remove-cael-pls
...
Removes External Shield Generators
2016-01-27 16:49:28 -05:00
243fae96c6
flag split
2016-01-27 16:36:43 -05:00
913922b408
Adds in Skeleton Race
2016-01-27 00:45:32 -05:00
3a39d9d99d
end conflict fixes
...
did i SERIOUSLY upload my comparison file last time? FUCK
2016-01-26 22:46:03 -05:00
b2881bdc94
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-01-26 21:17:25 -05:00
e9c2d27d09
being conflict fix(3/2)
...
I SWEAR TO FUCK I NEED TO PAY ATTENTION
2016-01-26 21:16:31 -05:00
9b5f8445f8
begin conflict fix (2/2)
2016-01-26 21:12:03 -05:00
53f410272a
home streach.
2016-01-26 20:53:13 -05:00
Aurorablade