Fox McCloud
f42db0f8b8
Merge pull request #3180 from Kyep/obsannoyance
...
Clarified confirmation prompts for ghosting
2016-01-10 18:04:49 -05:00
Crazylemon64
1fb0a336a7
Bomb guardians notify their master when they ready a bomb
...
Summmoners can't trip their own guardian bombs, for good measure
Bomb guardian summoners can now safely defuse their guardian's bombs
2016-01-10 13:51:44 -08:00
Fox McCloud
274b9df69f
Revert "Fixes Tails Overlaying Arms"
2016-01-10 08:04:07 -05:00
Kyep
41d84eb2f8
Clarified confirmation prompt for chars ghosting while alive
2016-01-10 00:00:42 -08:00
Kyep
e73b84abd4
Clarified new_player observation button message
...
Previous message stated 30 minutes. This was wrong.
2016-01-09 23:59:45 -08:00
TheDZD
f36e636d4b
Merge pull request #3166 from KasparoVy/Tail-Fix
...
Fixes Tails Overlaying Arms
2016-01-09 23:52:26 -05:00
TheDZD
73225f6d5b
Merge pull request #3158 from Crazylemon64/RAEGIN'-MAEGES!!!
...
Fixes RAGIN' MAGES
2016-01-09 23:52:12 -05:00
TheDZD
576a726431
Merge pull request #3159 from Fox-McCloud/posibrain-nerf
...
Positronic Brain Balance
2016-01-09 23:12:19 -05:00
Crazylemon64
421c5688ab
Basic operation complete!
2016-01-09 02:46:49 -08:00
Crazylemon64
c6b5df6cfe
Gets things functional
...
My human-from-client-prefs runtimes like crazy, though
2016-01-09 02:25:07 -08:00
TheDZD
33f76d9f3b
Merge pull request #3153 from Fox-McCloud/hulk-balance
...
Hulk Balance
2016-01-08 19:26:07 -05:00
KasparoVy
8c2acbfc8c
Sorts out Commenting
2016-01-08 18:13:01 -05:00
KasparoVy
16c5af933c
Fix Pass 2
...
Corrects the issue in Fix Pass 1
The tail's north sprite will only be rendered to the tail layer, so it
won't overlap arms and gloves.
2016-01-08 17:16:28 -05:00
KasparoVy
0c0f505d82
Fix Pass 1
...
Issue: Facing north means the tail is overlayed by just about everything
but the body.
2016-01-08 16:33:57 -05:00
Fox McCloud
aa6e5d8e8a
Merge pull request #3161 from Tastyfish/observervation
...
Interrogation Observervation & some emote pronoun fixes
2016-01-08 15:06:35 -05:00
Fox-McCloud
a940a4ece1
tweaks
2016-01-08 15:01:40 -05:00
Fox McCloud
05c68fa9ef
Merge pull request #3143 from Crazylemon64/i_hate_fun
...
Makes everything terrible
2016-01-08 14:03:32 -05:00
Tastyfish
0a9389e51a
Fixed some emotes to handle pronouns correctly
2016-01-08 09:17:19 -05:00
Fox-McCloud
5cbaa5e8fd
beep-boop
2016-01-08 03:06:51 -05:00
Fox-McCloud
3000fd495f
Positronic Brain Balance
2016-01-08 02:50:20 -05:00
TheDZD
f5f90c720b
Merge pull request #3154 from Fox-McCloud/damage-fix
...
Fixes Take Overall Damage
2016-01-07 19:56:27 -05:00
Fox-McCloud
b5af35f7d0
Fixes Take Overall Damage
2016-01-07 19:27:54 -05:00
Fox-McCloud
39e9a420c3
Hulk Balance
2016-01-07 19:11:01 -05:00
Crazylemon64
0a91b351c0
SSD people fall asleep more reliably
2016-01-07 09:05:52 -08:00
Crazylemon64
e6842e216a
Fun is the worst, don't have it ever
2016-01-07 00:28:40 -08:00
TheDZD
3d316d9c66
Merge pull request #3116 from Fox-McCloud/slipping-floors
...
Slippery Refactor and Floors
2016-01-05 21:42:26 -05:00
TheDZD
34901c8664
Merge pull request #3125 from Fox-McCloud/typo-fixes
...
Fixes a Few Vulp Typo's
2016-01-05 20:20:37 -05:00
Fox-McCloud
9478fc078c
Fixes a Few Vulp Typo's
2016-01-05 19:39:19 -05:00
TheDZD
750d555ff0
Merge pull request #3107 from Fox-McCloud/vox-tails-vulp-markings
...
Vox Tail and Vulp Markings
2016-01-05 19:35:34 -05:00
Fox-McCloud
38ee27898b
structuring
2016-01-05 01:34:16 -05:00
Crazylemon64
3a3f0f56c4
Simple_animals now tick down sleeping, so relogging doesn't cause deaf
2016-01-04 21:48:03 -08:00
Crazylemon64
2f642e6d75
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into simple_animals_sleeping
2016-01-04 21:44:27 -08:00
Fox-McCloud
447be6f9fd
binsult.ogg
2016-01-05 00:41:46 -05:00
Fox-McCloud
4221d033ab
Slipping Refactor and Floors
2016-01-04 21:22:59 -05:00
Crazylemon
df224e81d6
Simple animals will now tick down sleeping
2016-01-04 13:47:36 -08:00
Crazylemon
855b2f7f61
Summoned guardians will vanish without a master
2016-01-04 07:01:36 -08:00
Aurorablade
948adea83b
Added Asses as an organ
...
...made you look...
seriously though, refined some surgery datums/steps and commiting so i
can go bugfix some stuff...and a sidequest...i need to adjust return
values.
2016-01-04 08:25:39 -05:00
Fox-McCloud
59a3a5281e
Vox Tail and Vulp Markings
2016-01-04 02:10:47 -05:00
Fox McCloud
103372e92b
Merge pull request #3037 from KasparoVy/master
...
Adds Body Marking Customization, Head Accessories, Revises Unathi Customization, Related Minor Fixes, etc.
2016-01-03 22:33:40 -05:00
Fox McCloud
5f43d9e93f
Merge pull request #3088 from tigercat2000/code_styling_nazi
...
January Cleaning
2016-01-03 19:42:09 -05:00
Tastyfish
9ebe5c2c5c
Fixed using :i to speak into intercoms
2016-01-03 18:29:19 -05:00
TheDZD
b161d32687
Merge pull request #3081 from Fox-McCloud/on-fire
...
Updates On Fire Sprite
2016-01-03 11:23:44 -05:00
Tigercat2000
b606a6d1fd
Clean incorrect styling for the ++ operator
2016-01-02 10:46:01 -08:00
KasparoVy
f18c04ed0e
Adds Vulpkanin head markings to Head Accessory
...
Tested and it turns out it looks pretty good. The purpose of this commit
is that most of the facial markings work quite well together in pairs
given proper colouring and can look pretty sweet, so why not
2016-01-02 01:13:14 -05:00
Aurorablade
bd19dc6942
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-01-01 22:38:23 -05:00
Aurorablade
a4c420ccde
Conflict fixing time
2016-01-01 22:32:13 -05:00
Fox-McCloud
78abd5b12e
Updates On Fire Sprite
2016-01-01 21:06:07 -05:00
TheDZD
ac8a3ba061
Merge pull request #3068 from Fox-McCloud/shocking
...
Electrocution Refactor+Electric Reagents
2016-01-01 18:55:36 -05:00
Fox McCloud
e27d585889
Merge pull request #3072 from Aurorablade/Flyswatter
...
bug fixes
2016-01-01 17:33:19 -05:00
Tastyfish
421faee4f8
Makes footstep sounds check if we actually moved
2016-01-01 01:45:47 -05:00
