45fd531594
PDA soft gc / forceMove
2016-02-12 18:15:34 -05:00
bd527a5745
Merge pull request #3571 from tigercat2000/ircmods
...
send2irc Multi-Host upgrade
2016-02-12 18:07:41 -05:00
4f197cd48b
Also moved the pda stuff to a module
2016-02-12 16:51:16 -05:00
f47131fbb2
Refactors Bot Weapon Identification
2016-02-12 14:52:50 -05:00
46d6182cbc
Lying only affects things that don't move you
2016-02-12 09:47:41 +00:00
a8f9ea2086
pda refactor
2016-02-12 03:24:21 -05:00
c5011003bd
its done
...
Review it, test iit locally. going to bed now, long shift at work
tomarrow.
2016-02-12 03:04:24 -05:00
4d89ef5aba
Adds Chimichangas
...
💀 + 💩 + L
2016-02-12 01:17:43 -05:00
954d0dadfa
Prize Counter WIP commit
2016-02-12 00:32:21 -05:00
b42d865c83
almost ready for review
2016-02-11 23:21:13 -05:00
9caf834f36
Merge pull request #3573 from TheDZD/i-can't-colors
...
Makes adminhelp colors slightly less blinding
2016-02-11 18:38:04 -05:00
c773f2a010
Makes adminhelp colors slightly less blinding
2016-02-11 18:21:27 -05:00
545d3abf19
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-11 18:03:09 -05:00
0f77eb068f
Conflicts
2016-02-11 17:57:37 -05:00
5e8fa9de84
commiting before fixing merge conflicts
...
and stumps cuase i think i got a fix from of all places bay
2016-02-11 14:36:16 -05:00
d6db130909
send2irc Multi-Host upgrade
...
Allows for send2irc to send to multiple hosts.
2016-02-11 11:24:30 -08:00
34e45a656e
Unarmed Attack+Martial Arts Update+Golem Refactor
2016-02-11 00:11:20 -05:00
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
f7b40b6753
Merge pull request #3567 from TheDZD/i-can't-colors
...
Fixes DZD Being Colorblind
2016-02-10 20:20:08 -05:00
07c63d7848
Fixes DZD being colorblind
...
I accidentally made mentorhelps the same color as mentor OOC, whoops.
2016-02-10 20:09:56 -05:00
d704054d67
Merge pull request #3551 from Fox-McCloud/auto-reload
...
Kinetic Accelerators Auto-Reload
2016-02-10 18:36:22 -05:00
c0899deeb0
Merge pull request #3555 from TheDZD/master
...
Jobban Tweaks
2016-02-10 17:22:39 -05:00
9afddc2e06
Merge pull request #3552 from Crazylemon64/fixes_ai_power_hacking
...
Revamps that weird dialog about hacking the nearest APC to actually work
2016-02-10 17:21:50 -05:00
eabd94e844
Changes
...
Reverts banana peel and soap to slip whilst walking
No longer slip whilst lying down
No longer slip whilst getting in and out of a closet containing a
slippery item
2016-02-10 08:36:19 +00:00
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
eca3edfec3
LIMBSTUMPS
2016-02-09 18:32:40 -05:00
5a8ffbd198
Jobban Tweaks
2016-02-09 16:35:30 -05:00
1ba299b289
Revamps that weird dialog about hacking the nearest APC to actually work
2016-02-09 00:59:49 -08:00
5aa671b630
Fixes indents.
2016-02-09 01:41:22 -06:00
0561987ed8
Kinetic Accelerators Auto-Reload
2016-02-09 02:21:19 -05:00
b6b3204bf7
Makes Mob Capsule code better.
2016-02-09 01:02:25 -06:00
24afe14a12
Adds in mob capsules
2016-02-08 23:40:53 -06:00
a39fa8eaca
Merge pull request #3486 from TheDZD/halp-george-malons-is-griffin-meh
...
Renames Adminhelp Categories
2016-02-08 21:37:02 -05:00
3a9e13fdae
Merge pull request #3527 from Fox-McCloud/syndi-donk
...
Tweaks Syndicate Donk Pockets
2016-02-08 21:34:12 -05:00
e9d9e3b3e6
Colors!
2016-02-08 21:25:14 -05:00
951f25a14d
Fixes emagging an R&D console
2016-02-08 17:06:59 -08:00
7ee63b1e3b
Merge pull request #3538 from Tastyfish/cuccumb
...
Fixed succumb for weird living mobs and maxHealth
2016-02-08 20:04:04 -05:00
fbb7714f41
Merge pull request #3532 from Crazylemon64/more_simple_animal_gibs
...
Lets you gib butterflies and lizards for keks
2016-02-08 20:01:38 -05:00
e116dd3cfe
Merge pull request #3541 from VampyrBytes/VampPassives
...
Fixes Vamp Passives (#2812 )
2016-02-08 18:23:04 -05:00
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
df963a6aa5
Adds head patting
2016-02-08 13:35:26 +01:00
bb0da27fac
Optimized div2
2016-02-08 05:02:41 -05:00
4f40472604
Fixed succumb for weird living mobs and maxHealth
2016-02-08 03:54:58 -05:00
3b90cb703a
almost ready for review
2016-02-08 01:16:13 -05:00
45cf159ecf
Lets you gib butterflies and lizards for keks
...
Butterflies don't actually give you meat
2016-02-07 13:34:17 -08:00
1d984acda0
Merge pull request #3502 from VampyrBytes/cleanSlips
...
Cleans up slipping code
2016-02-07 15:11:23 -05:00
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
65e3b13d2e
Readds Bald Tajaran Hairstyle, Fixes non-Human Masks
2016-02-07 02:10:44 -05:00
e5f5b68c92
fixed slime surgery
2016-02-07 00:54:46 -05:00
1f569053cc
Tweaks Syndicate Donk Pockets
2016-02-06 23:25:01 -05:00
Tastyfish