Commit Graph

12097 Commits

Author SHA1 Message Date
TheDZD
5a8ffbd198 Jobban Tweaks 2016-02-09 16:35:30 -05: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
Fox McCloud
b5a5ca6e54 Merge pull request #3477 from VampyrBytes/bugfix(#3466)
Bugfix(#3466)
2016-02-06 00:20:25 -05:00
Crazylemon
db5e0d56c3 Removes vestigial code from the PR
A chem cache, which was intended as a replacement for the reagents
storage locker, and fethas' surgery helper file that I accidentally
carried over because automatically removing files on checkout is not
git's specialty
2016-02-05 10:06:55 -08:00
Crazylemon64
eba74c1392 Gives chemistry breathing room - moves welding tank to a wall-mount version 2016-02-05 03:20:57 -08:00
VampyrBytes
11df4c50b6 Fixes being able to take off helmet when toggling combat/travel modes 2016-02-04 21:24:38 +00:00
VampyrBytes
05e7858257 Fixes syndie suit name part of #3421
Fixes name and description of elite syndie suit after mode toggle

Don't close #3421 yet, I'm looking into the other part but need more
info
2016-02-04 19:46:54 +00:00
VampyrBytes
18d7335f4e Fixes #3497
Deathsquad pulse rifle now fires correct round type
2016-02-04 17:45:00 +00:00
VampyrBytes
9d5c754f11 rename argument for clarity 2016-02-04 07:33:35 +00:00
Fox McCloud
351152f9fc Merge pull request #3495 from Tastyfish/pillnames
Shortened default pill/patch name
2016-02-03 22:24:43 -05:00
Fox McCloud
6e4555cdcd Merge pull request #3494 from Tastyfish/buckets
Buckets and set transfer amount improvement
2016-02-03 22:24:33 -05: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
Crazylemon64
181eb47d8f goodbye, crusty code 2016-02-03 00:42:44 -08:00
Fox McCloud
b30a0dfacb Merge pull request #3441 from Crazylemon64/squishy_hair
Squishy Slime Hair Woooooo
2016-02-02 21:14:54 -05:00
TheDZD
6261a4fe4e Merge pull request #3480 from Crazylemon64/borer_event_boost
Makes borer more likely to occur
2016-02-02 21:05:04 -05:00
TheDZD
7c11321cd9 Merge pull request #3438 from Crazylemon64/skele_drinks_milk
Milk is now a strong healing reagent for skeletons
2016-02-02 21:00:28 -05:00
Tastyfish
e43f912c99 Shortened default pill name 2016-02-02 18:54:31 -05:00
Tastyfish
4b9c1a3219 Buckets and set transfer amount improvement 2016-02-02 18:35:02 -05:00
Fox McCloud
ca27fad887 Merge pull request #3482 from Tastyfish/suicide-squish
Some more species suicide messages
2016-02-02 17:47:38 -05:00
Crazylemon64
5e403b49ec Add's DZD's tweak 2016-02-02 13:50:41 -08:00
Tastyfish
c3c3fbe577 existential problem 2016-02-02 14:30:48 -05:00
Fox McCloud
78d40c3f87 Merge pull request #3449 from VampyrBytes/bugfix(#3414)
Fixes #3414
2016-02-02 00:00:55 -05:00
Fox McCloud
0d9f2da748 Merge pull request #3462 from KasparoVy/Masks-For-BIGNOSE
Sharing is Caring: Masks Galore
2016-02-01 23:55:25 -05:00
TheDZD
ba8a2f3247 Renames adminhelp categories 2016-02-01 22:05:08 -05:00
KasparoVy
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
Tastyfish
cb2d166141 Some more species suicide messages 2016-02-01 15:24:32 -05:00
Crazylemon
a7c6ae2871 Chocolate no longer makes people ripperonis 2016-02-01 12:23:05 -08:00
Crazylemon
7795c77abf Tweaks chances 2016-02-01 12:10:08 -08:00
Crazylemon64
1d920c58e8 Makes borer more likely to occur 2016-02-01 11:42:30 -08:00
Crazylemon64
029bcc7daa Merge branch 'master' of https://github.com/Crazylemon64/Paradise into skele_drinks_milk 2016-02-01 10:56:40 -08:00
Crazylemon64
0913ea5664 desnowflakes el memerinnos 2016-02-01 10:54:48 -08:00