Commit Graph

15929 Commits

Author SHA1 Message Date
ZomgPonies
96d015cc06 Merge pull request #878 from tigercat2000/Curtains
4 Baystation12 PR's
2015-04-26 10:08:06 -04:00
ZomgPonies
100789f6ec Merge pull request #877 from Fox-McCloud/beakerbomb
[Goonchem] Beaker Bombs
2015-04-26 10:07:46 -04:00
ZomgPonies
0342e4306c Merge pull request #870 from veganzombeh/digitalcamera
Adds digital camera to the protolathe construction menu.
2015-04-26 10:07:31 -04:00
veganzombeh
85ca01350f Adds a ditigal camera to the protolathe construction menu.
The digital camera allows you to save up to 10 photos, and print or delete them whever you want. It still requires film to print photos.
2015-04-26 10:07:08 +01:00
Fox-McCloud
fb579b0d19 assembly fixes 2015-04-25 22:43:40 -04:00
ZomgPonies
43e6e900fb Merge pull request #882 from CrAzYPiLoT-SS13/master
Language fix + Corgi health status fix
2015-04-25 17:50:05 -04:00
ZomgPonies
2ea39812e7 Merge pull request #847 from TheDZD/420yolotest
Removes Changeling Bloodtest
2015-04-25 17:48:53 -04:00
ZomgPonies
013e7cfcdd Merge pull request #874 from Fox-McCloud/chem-messages
[Goonchem] No Mix Messages
2015-04-25 17:45:31 -04:00
Matt
a59f797752 Addition
What it says on the tin.
2015-04-25 22:46:12 +02:00
TheDZD
86ef9115dd Merge pull request #880 from Fox-McCloud/asteroid-fix
Asteroid Temp Fix
2015-04-25 15:53:02 -04:00
Matt
bbe0c08fe8 Language fix
Fixes https://github.com/ParadiseSS13/Paradise/issues/845
This now works. Simple as that.
2015-04-25 21:45:53 +02:00
Fox-McCloud
b5fe239c24 Asteroid Temp Fix 2015-04-25 15:36:21 -04:00
TheDZD
83049b9a85 Merge pull request #869 from Fox-McCloud/oldcode
Old Song (and New Title)
2015-04-25 15:29:03 -04:00
TheDZD
71b4e9e719 Merge pull request #871 from Fox-McCloud/goregib
More Gore from Gibbing
2015-04-25 15:28:49 -04:00
TheDZD
fe6090e569 Merge pull request #868 from Fox-McCloud/carpplush
Carp Plushie Syndies Buff
2015-04-25 15:28:45 -04:00
TheDZD
3f1726fbb8 Merge pull request #867 from Fox-McCloud/smoke
[Goonchem] Smoke Tweaks
2015-04-25 15:28:40 -04:00
Tigercat2000
7f8b190e5f Small refactor of curtains
This commit ports Baystation12/Baystation12#8921.
Curtains now use SHOWER_OPEN_LAYER and SHOWER_CLOSED_LAYER instead of
manual layer definitions. Two new default shower curtains have been
added, Engineering and Security. They are not currently avalible on the
map due to the fact that Paradise's map, as of this commit, does not
have any showers anywhere but the dorms & engineering satellite.
2015-04-25 09:36:08 -07:00
Tigercat2000
f76284b7af Add afterbuckle proc to beds, refactor comfychairs
This commit ports Baystation12/Baystation12#8527, as well as their
afterbuckle system. After a mob is buckled/unbuckled, afterbuckle will be
called on the object, which does nothing by default.

Comfy Chairs have been refactored to use a grayscale sprite, and also to
use overlays for the arms. This means that new colors are just a RGB
definition.
2015-04-25 09:36:06 -07:00
Tigercat2000
4acd10f60b Adds creating hazard floor overlay with tape
This commit ports Baystation12/Baystation12#8836. This adds the ability
to create new hazard overlay effects by clicking on the floor with a
tape roll.
2015-04-25 09:36:04 -07:00
Tigercat2000
2a0879468a Adds Barsign Picking
This commit allows the bartender, or anyone with access_bar, to change the
barsign's image by hitting it with an ID. This commit also adds a variable
to disable such behavior for custom maps. Finally, this commit adds two
new icons for the barsign, named simply 'on' and 'off', which look like
the base sprite for most of the other barsigns, but blank.
2015-04-25 09:35:38 -07:00
Tigercat2000
735bfdf012 Fixes cmd_ghost_drag perms
This fixes the cmd_ghost_drag perms to work as they were originally
intended to- requiring either varedit OR r_admin + r_debug. The original
checks were exclusive, as it checked for no r_varedit OR no r_admin +
r_debug, which means that unless the user had all three, it would always
fail.
2015-04-25 08:08:58 -07:00
Fox-McCloud
c226067277 [Goonchem] Beaker Bombs 2015-04-25 05:28:56 -04:00
Fox-McCloud
cf82b8db30 Merge remote-tracking branch 'upstream/master' into oldcode 2015-04-25 02:23:38 -04:00
Fox-McCloud
0f3b349f1c Merge pull request #873 from tigercat2000/EmergencyVcrawlPatch
Emergency Ventcrawl Patch
2015-04-24 21:01:57 -04:00
DZD
f5ace231e1 Fixes invisible carbon/human
High priority, needs to be merged and patched ASAP.

Need one of the other maintainers to check to see if this won't be
particularly process-intensive for the server.
2015-04-24 19:02:44 -04:00
Fox-McCloud
bd16e0fbaa [Goonchem] No Mix Messages 2015-04-24 16:21:33 -04:00
Tigercat2000
e3b3db6d31 Fix major bug with ventcrawl
Because we have insane-r movecode than VG, there was a bug that you could
end up getting violently sucked into an atmos machine and shoved out into
the vents. This commit fixes this in a workaround manner.
2015-04-24 12:18:29 -07:00
Fox-McCloud
02f749a32b Merge pull request #863 from ZomgPonies/unban
Admin unban panel overhaul
2015-04-24 14:59:39 -04:00
TheDZD
ae86274de8 Merge pull request #866 from Fox-McCloud/grabfix
Grab Fix
2015-04-24 14:59:12 -04:00
TheDZD
d570c0df31 Merge pull request #862 from tigercat2000/mbcidip
Bay play_server_sound caching & admin 'who' showing account age
2015-04-24 14:57:12 -04:00
Fox-McCloud
4e8ec07743 Merge pull request #861 from TheDZD/aooc
Adds Antagonist OOC
2015-04-24 14:56:53 -04:00
Fox-McCloud
32e868621f More Gore from Gibbing 2015-04-24 08:01:07 -04:00
Fox-McCloud
d737fbbde4 Old Song (and New Title) 2015-04-24 02:23:16 -04:00
Fox-McCloud
7a2854ba98 Carp Plushie Syndies Buff 2015-04-24 01:40:24 -04:00
Fox-McCloud
9a99f8758f [Goonchem] Smoke Tweaks 2015-04-24 00:17:03 -04:00
Fox-McCloud
3439a034d8 Grab Fix 2015-04-23 22:16:44 -04:00
ZomgPonies
55060280f0 Admin unban panel overhaul 2015-04-23 14:02:51 -04:00
Tigercat2000
34863374a0 First part of Bay admin improvements
This commit integrates baystation12's play_server_sound system, admin
'Who' showing account age.
2015-04-23 10:01:45 -07:00
DZD
d0620af858 Adds AOOC
via Baystation12/Baystation12#8411
2015-04-23 12:41:06 -04:00
Fox-McCloud
773f093f2b Spider Balance--Venom 2015-04-22 18:36:38 -04:00
ZomgPonies
22b07a5820 Merge pull request #854 from veganzombeh/vampire
Vampires get nutrition from blood, not food.
2015-04-22 08:43:07 -04:00
veganzombeh
2d93888ea0 Vampires get nutrition from blood, not food.
Sucking blood increases nutrition, nutriment reagent does not. Also adds an immunity check for holy water contact.
2015-04-22 10:19:16 +01:00
Bram961
1b75aacec0 Popping sound fix
Fixes the popping sound heared when white noise is toggled on.
2015-04-22 03:59:10 +02:00
Fox-McCloud
099d638c15 Merge pull request #851 from ZomgPonies/shadow
Slime people fixes
2015-04-21 20:02:33 -04:00
ZomgPonies
1cc53ab186 Yeah and this too. 2015-04-21 20:00:19 -04:00
ZomgPonies
5e68ee4bd8 Forgot this jeeze! 2015-04-21 19:55:32 -04:00
Fox-McCloud
e8038738f6 Merge pull request #800 from ZomgPonies/shadow
Mutantrace update
2015-04-21 18:36:24 -04:00
ZomgPonies
8ce0212850 Final fixes 2015-04-21 18:05:43 -04:00
ZomgPonies
180f61f5fb Merge pull request #830 from Fox-McCloud/hitblips
Removes Hitblips
2015-04-21 17:33:32 -04:00
ZomgPonies
bc9a6fe09e Merge pull request #839 from tigercat2000/MassDriveVG
Code rework of placing things on walls.
2015-04-21 17:31:45 -04:00