TheDZD
af648474cf
Merge pull request #3583 from Fox-McCloud/permit-refactor
...
Refactors Bot Weapon Identification
2016-02-13 18:23:12 -05:00
Fox McCloud
284c4fe9ae
Merge pull request #3582 from Crazylemon64/dont_use_this_floor
...
Makes it painfully obvious not to use plain old /turf/simulated/floor
2016-02-13 13:40:30 -05:00
Fox McCloud
771babcd0a
Merge pull request #3576 from FalseIncarnate/kitchen
...
Adds Chimichangas
2016-02-13 01:15:00 -05:00
Tastyfish
8d51fc8f1e
Fixed handcuff hud overlay
2016-02-13 00:39:04 -05:00
Crazylemon64
b71905dbb1
Updates the admin's buildmode to use "plasteel" floor
2016-02-12 18:43:57 -08:00
Fox McCloud
c028b4e8b5
Merge pull request #3547 from KasparoVy/Colouring-Bandanas
...
Adds Orange + Purple Bandanas and Bandana Colouring, Taj/Una Bandana Sprite Tweaks + Mask Adjustment Refactor
2016-02-12 18:34:30 -05:00
Fox McCloud
ce47eefcf2
Merge pull request #3545 from VampyrBytes/BreakSlipLock
...
walking prevents sliplock
2016-02-12 18:19:50 -05:00
TheDZD
65a788d51f
Merge pull request #3569 from Fox-McCloud/unarmed-golems-martial
...
Unarmed Attack+Martial Arts Update+Golem Refactor
2016-02-12 18:17:32 -05:00
Fox McCloud
bd527a5745
Merge pull request #3571 from tigercat2000/ircmods
...
send2irc Multi-Host upgrade
2016-02-12 18:07:41 -05:00
Fox-McCloud
f47131fbb2
Refactors Bot Weapon Identification
2016-02-12 14:52:50 -05:00
VampyrBytes
46d6182cbc
Lying only affects things that don't move you
2016-02-12 09:47:41 +00:00
FalseIncarnate
4d89ef5aba
Adds Chimichangas
...
💀 + 💩 + L
2016-02-12 01:17:43 -05:00
Fox McCloud
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
TheDZD
c773f2a010
Makes adminhelp colors slightly less blinding
2016-02-11 18:21:27 -05:00
Tigercat2000
d6db130909
send2irc Multi-Host upgrade
...
Allows for send2irc to send to multiple hosts.
2016-02-11 11:24:30 -08:00
Fox-McCloud
34e45a656e
Unarmed Attack+Martial Arts Update+Golem Refactor
2016-02-11 00:11:20 -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
f7b40b6753
Merge pull request #3567 from TheDZD/i-can't-colors
...
Fixes DZD Being Colorblind
2016-02-10 20:20:08 -05:00
TheDZD
07c63d7848
Fixes DZD being colorblind
...
I accidentally made mentorhelps the same color as mentor OOC, whoops.
2016-02-10 20:09:56 -05:00
TheDZD
d704054d67
Merge pull request #3551 from Fox-McCloud/auto-reload
...
Kinetic Accelerators Auto-Reload
2016-02-10 18:36:22 -05:00
Fox McCloud
c0899deeb0
Merge pull request #3555 from TheDZD/master
...
Jobban Tweaks
2016-02-10 17:22:39 -05:00
Fox McCloud
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
VampyrBytes
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
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
TheDZD
5a8ffbd198
Jobban Tweaks
2016-02-09 16:35:30 -05:00
Crazylemon64
1ba299b289
Revamps that weird dialog about hacking the nearest APC to actually work
2016-02-09 00:59:49 -08:00
Spacemanspark
5aa671b630
Fixes indents.
2016-02-09 01:41:22 -06:00
Fox-McCloud
0561987ed8
Kinetic Accelerators Auto-Reload
2016-02-09 02:21:19 -05:00
Spacemanspark
b6b3204bf7
Makes Mob Capsule code better.
2016-02-09 01:02:25 -06:00
Spacemanspark
24afe14a12
Adds in mob capsules
2016-02-08 23:40:53 -06:00
Fox McCloud
a39fa8eaca
Merge pull request #3486 from TheDZD/halp-george-malons-is-griffin-meh
...
Renames Adminhelp Categories
2016-02-08 21:37:02 -05:00
TheDZD
3a9e13fdae
Merge pull request #3527 from Fox-McCloud/syndi-donk
...
Tweaks Syndicate Donk Pockets
2016-02-08 21:34:12 -05:00
TheDZD
e9d9e3b3e6
Colors!
2016-02-08 21:25:14 -05:00
Crazylemon
951f25a14d
Fixes emagging an R&D console
2016-02-08 17:06:59 -08:00
Fox McCloud
7ee63b1e3b
Merge pull request #3538 from Tastyfish/cuccumb
...
Fixed succumb for weird living mobs and maxHealth
2016-02-08 20:04:04 -05:00
Fox McCloud
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
Fox McCloud
e116dd3cfe
Merge pull request #3541 from VampyrBytes/VampPassives
...
Fixes Vamp Passives (#2812 )
2016-02-08 18:23:04 -05: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
Robertha89
df963a6aa5
Adds head patting
2016-02-08 13:35:26 +01:00
Tastyfish
bb0da27fac
Optimized div2
2016-02-08 05:02:41 -05:00
Tastyfish
4f40472604
Fixed succumb for weird living mobs and maxHealth
2016-02-08 03:54:58 -05:00
Crazylemon64
45cf159ecf
Lets you gib butterflies and lizards for keks
...
Butterflies don't actually give you meat
2016-02-07 13:34:17 -08: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
KasparoVy
65e3b13d2e
Readds Bald Tajaran Hairstyle, Fixes non-Human Masks
2016-02-07 02:10:44 -05:00
Fox-McCloud
1f569053cc
Tweaks Syndicate Donk Pockets
2016-02-06 23:25:01 -05:00
Fox McCloud
217c62f9f5
Merge pull request #3516 from Crazylemon64/cleaner_chemistry
...
Moves Chemistry's welding tank to a wall-mounted version
2016-02-06 07:46:30 -05:00
Fox-McCloud
fec86a78e4
as requested
2016-02-06 03:01:45 -05:00
Fox McCloud
c072f9a8e4
Merge pull request #3510 from VampyrBytes/EliteSyndieSuit
...
fixes #3421
2016-02-06 01:45:08 -05:00
Fox-McCloud
2e244feb0c
Sink and Toilet Fixes
2016-02-06 01:25:52 -05:00
TheDZD