Fox McCloud
aa7b36487b
Merge pull request #3580 from VampyrBytes/PlasticBags
...
Fixes plastic bags suffocating when they shouldn't (#3577 )
2016-02-12 13:46:06 -05:00
Crazylemon64
806ee1f9c3
Makes it painfully obvious not to use plain old /turf/simulated/floor
...
Probably will make some mapping look weird, but that floor doesn't behave
properly - will react to crowbar, but won't actually yield tiles, for
example
2016-02-12 04:18:29 -08:00
VampyrBytes
90c485355f
Fixes plastic bags suffocating when they shouldn't ( #3577 )
...
As title. Now checks your head slot for the bag rather than relying on a
variable that might not be reset in time
2016-02-12 11:37:19 +00:00
Tastyfish
a8f9ea2086
pda refactor
2016-02-12 03:24:21 -05:00
FalseIncarnate
954d0dadfa
Prize Counter WIP commit
2016-02-12 00:32:21 -05:00
Aurorablade
b42d865c83
almost ready for review
2016-02-11 23:21:13 -05:00
TheDZD
6b127b158f
Spacepod Tweaks
2016-02-11 20:39:13 -05:00
Fox McCloud
b19dd82cdf
Merge pull request #3568 from KasparoVy/Ayy-L'hitstheblunt
...
Grey Smokeables
2016-02-11 19:00:36 -05:00
TheDZD
5df91c7e1f
Merge pull request #3557 from Fox-McCloud/spell-icons-fake-nath
...
Updates Fake Disintegrate and Spell Icons
2016-02-11 18:09:12 -05:00
TheDZD
2a64ec8433
Merge pull request #3559 from Crazylemon64/raginger_mages
...
Makes mages more ragin
2016-02-11 18:07:27 -05:00
Aurorablade
545d3abf19
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-11 18:03:09 -05:00
Aurorablade
0f77eb068f
Conflicts
2016-02-11 17:57:37 -05:00
Fox-McCloud
34e45a656e
Unarmed Attack+Martial Arts Update+Golem Refactor
2016-02-11 00:11:20 -05:00
KasparoVy
c00121e47a
Grey Smokables
2016-02-10 23:07:26 -05:00
KasparoVy
79af19d559
Adds Orange and Purple Bandanas, Adds Bandana Colouring, Tweaks Taj/Una Bandana Sprites, Refactors Bandana Adjusting
...
Also refactors bandana adjustment. I made the change because now it won't revert back to a black bandana after you adjust it twice after colouring it with a crayon in the washing machine.
Tested in the following ways:
Multiple washes, multiple recolourings: Description stayed 'The colours are a bit dodgy' and the name was appropriate for the colour. No sprite issues.
Spammed the adjustment, changing from the head to the face slot at random intervals: Same as above, no sprite issues, description was as intended, name of the item was as intended.
The tweak I made to the East and West directions of the Tajara and Unathi bandana sprites were just to make it fit the muzzle better and make it look like the cloth was pulled taut over the mouth as was the case with the Vulpkanin bandana (and the Vox) to a degree. Slightly less ghetto looking.
Enhanced Bandana Adjusting Functionality
Fixes a bug where adjusting a bandana kept it in the same slot
regardless of whether it was meant to be worn as a hat or a mask.
Fixes a bug where adjusting a bandana didn't change whether or not it
obscured your identity, even when you were wearing it as a hat.
2016-02-10 21:27:19 -05:00
Fox McCloud
c0899deeb0
Merge pull request #3555 from TheDZD/master
...
Jobban Tweaks
2016-02-10 17:22:39 -05:00
Crazylemon64
18cc737c0f
Might make the defib more reliable, and adds a message for the ghost not being present.
2016-02-10 11:23:53 -08:00
Crazylemon64
3689eb88ea
Makes mages more ragin
...
Also lets admins change the max_mages more flexibly - either through
players_per_mage, which it sticks to by default, or max_mages if set
2016-02-10 00:39:20 -08:00
Fox McCloud
4b973163a6
Merge pull request #3548 from Spacemanspark/Spark-plays-too-much-Pokemanz
...
Adds Pokemon to the game.
2016-02-10 00:51:11 -05:00
Fox-McCloud
5f2b5f1fde
Updates Fake Disintegrate and Spell Icons
2016-02-10 00:01:37 -05:00
TheDZD
a346ece1c4
You'd have to be blind to miss this.
2016-02-09 22:14:33 -05:00
TheDZD
4d0e8bb5e2
GET MAD
2016-02-09 18:12:47 -05:00
Fox McCloud
9ec6286446
Merge pull request #3550 from Tastyfish/tables3
...
Fixed extra table legs
2016-02-09 17:57:32 -05:00
Fox McCloud
e06fe2bb8d
Merge pull request #3549 from Crazylemon64/fix_the_black_walls
...
Walls will no longer become completely black when exploded
2016-02-09 17:57:20 -05:00
TheDZD
5a8ffbd198
Jobban Tweaks
2016-02-09 16:35:30 -05:00
Fox McCloud
403c4ec22e
Merge pull request #3539 from VampyrBytes/Bolas
...
Bolas now affect walking people
2016-02-09 06:09:49 -05:00
Crazylemon64
bcdaedb01e
Walls will now smooth and explode properly
2016-02-08 23:08:36 -08:00
Spacemanspark
b6b3204bf7
Makes Mob Capsule code better.
2016-02-09 01:02:25 -06:00
Tastyfish
13cf94c2f3
herp
2016-02-09 01:58:17 -05:00
Tastyfish
ca5d48487f
Fixed tables... again
2016-02-09 01:09:32 -05:00
Spacemanspark
24afe14a12
Adds in mob capsules
2016-02-08 23:40:53 -06:00
VampyrBytes
f307e9c700
Fixes span closure in vamp regen
...
Fixes my <span> cockup in #3541
2016-02-09 00:45:42 +00:00
VampyrBytes
e526753c75
Fixes Vamp Passives ( #2812 )
...
Fixes Vampire thermal vision
Improved regen was working, but the message was commented out due to
spam, it now shows without spamming
2016-02-08 20:44:04 +00:00
VampyrBytes
8e627b384c
Bolas now affect walking people
...
As per #3509 bolas no longer require a running stance to trip people
2016-02-08 10:10:37 +00:00
Fox McCloud
e3acd96ce7
Merge pull request #3525 from Regen1/powersink
...
Updates powersink to be similar to TG
2016-02-07 15:11:52 -05:00
Fox McCloud
1d984acda0
Merge pull request #3502 from VampyrBytes/cleanSlips
...
Cleans up slipping code
2016-02-07 15:11:23 -05:00
TheDZD
f45a09122c
Merge pull request #3522 from Fox-McCloud/sink-and-toilet-fixes
...
Sink and Toilet Fixes+Refactor
2016-02-07 15:03:23 -05:00
Regen
1464bb3862
Updates powersink to be similar to TG
2016-02-06 18:20:34 +01:00
Fox-McCloud
fec86a78e4
as requested
2016-02-06 03:01:45 -05:00
Fox-McCloud
2e244feb0c
Sink and Toilet Fixes
2016-02-06 01:25:52 -05:00
TheDZD
2de4b799bf
Merge pull request #3521 from Fox-McCloud/fixes-shit
...
Fixes Bear Trap IEDs and Duplicate Bear Traps
2016-02-05 23:36:29 -05:00
Fox-McCloud
78af714755
Fixes Bear Trap IEDs and Duplicate Bear Traps
2016-02-05 23:29:20 -05:00
Fox-McCloud
a7cc11b07a
Fixes Roundstart runtime with Spellbooks
2016-02-05 08:47:44 -05:00
Fox McCloud
b727d83e7d
Merge pull request #3496 from Tastyfish/chaplain-headset
...
Gave chaplain service radio headset
2016-02-03 22:24:53 -05:00
Fox McCloud
d1049ad383
Merge pull request #3423 from Crazylemon64/cloning_brain_scan
...
Adds a brain scan mode to the cloning system
2016-02-03 22:23:10 -05:00
Fox McCloud
7f939dc8a7
Merge pull request #3503 from Crazylemon64/borer_mind_understands
...
Trapped minds can now understand what the host mob can
2016-02-03 18:16:47 -05:00
Crazylemon
aa31de9ce8
Trapped minds can now understand what the host mob can
2016-02-03 12:57:29 -08:00
Crazylemon64
1c1bd52c54
Makes brain scan a selected mode rather than a button, for working nice with autoprocess
2016-02-03 10:06:41 -08:00
VampyrBytes
de45fc9aba
Cleans up slipping code
...
Puts slipping into one proc rather than being dealt with individually by
each item.
The only changes to functionality here are where it would have been
possible to slip on some items whilst flying. It will make any changes
decided on in #3490 or any future changes far more easy to implement
2016-02-03 09:44:32 +00:00
TheDZD
1e1444ad2c
Merge pull request #3485 from Crazylemon64/less_griefy_borers
...
Enhances symbiosis of Borers
2016-02-02 21:05:13 -05:00
