Commit Graph

8741 Commits

Author SHA1 Message Date
Tigercat2000
e598a4e40a Merge remote-tracking branch 'upstream/master' into ContextBasedGrab 2015-05-01 18:18:08 -07:00
Tigercat2000
26f1cd88d5 ONE DAY I WILL HAVE FIXED TOXINS MIXING
I left out a very important define from plasma windows that prevents them
from heating the room
2015-05-01 07:52:29 -07:00
Tigercat2000
36f8d0a114 Add CanAtmosPass to shuttle windows
ohgodpleasetellmeIdidn'tmissanythingelse
2015-04-30 19:45:48 -07:00
TheDZD
92a7c44bad Merge pull request #902 from Fox-McCloud/rings
Adds in Rings
2015-04-30 19:22:58 -04:00
Tigercat2000
4e4285dccf Fix plasma windows breaking due to temperature
So uh, I forgot to define fire_act AND temperature_act as returns for the
plasma windows, so the toxins chamber kept breaking open. Whoopsies.
2015-04-30 13:49:32 -07:00
ZomgPonies
37fa1108d4 Merge pull request #895 from tigercat2000/okayletstrysomethingslightlydifferent
LINDA
2015-04-30 13:18:48 -04:00
Fox-McCloud
8f686aab46 Merge pull request #898 from SirBloodBuske/SirBloodBuske-Alarm-Deconstuct-Fix
Update alarm.dm
2015-04-30 03:09:34 -04:00
SirBloodBuske
797ec2377f Update alarm.dm 2015-04-29 23:52:09 -07:00
SirBloodBuske
ae79fce8e8 Update alarm.dm
Fix'd spans
2015-04-29 23:42:43 -07:00
Tigercat2000
b91d86abcd Makes RCD qdel doors
This still doesn't fix the turf-not-updating bug, but it does make the RCD
qdel doors.
2015-04-29 20:26:59 -07:00
Tigercat2000
dfc74ebde6 Modify fire_act to temperature_expose where needed
This commit changes a bunch of objects fire_act's to temperature_expose,
to allow for superhot gas to act like an actual hotspot. This behaviour is
consistant with -tg-.
2015-04-29 16:56:12 -07:00
Fox-McCloud
1b0ea1e226 Adds in Rings 2015-04-29 19:05:43 -04:00
Tigercat2000
b9d9684238 Fix Programmable Unloader circuit
This machine is glitchy, one might even call it entirely broken, but I
doubt an outdated circuit board is the intentional way to remove it. This
commit repairs the programmable unloader circuit, so that they are
actually buildable now.
2015-04-29 15:25:38 -07:00
Tigercat2000
173bdc4c27 Mob life fix, firedoors
This commit does the following;
 - Repairs mob breathing by adding a new ticker process, mob_master, as
   air_master is an unreliable ticker with it's customizable speed
 - Restore firedoor attack_hand access
  - You can now open and close firedoors by using no item, provided you
    have access to them and they aren't locked.
2015-04-29 12:47:23 -07:00
SirBloodBuske
2f78018091 Update alarm.dm 2015-04-29 12:42:20 -07:00
Tigercat2000
b56d1cf06c LINDA patch- Airlock atmospass fix, Runtime fix
This commit fixes the bug encountered wherein airlocks were not checked
before gas was allowed to move onto their tile- but only if opened and
closed. The problem was that they did not issue the correct atmos updating
command when they closed, but they did when they opened, and when they are
created.

The runtime was seemingly random, but the small sanity check will prevent
it from happening again.
2015-04-29 07:16:54 -07:00
SirBloodBuske
1cf4a707f7 Update alarm.dm 2015-04-28 23:05:54 -07:00
Tigercat2000
32ecfbafea Update firedoor sprite, minor door Move() change
This commit updates the firedoor sprite to the -tg- glass firedoors. It
also changes the fire overlay back to a firey overlay instead of the
greyscaled version. The door Move() has been changed to help any possible
unforseen scenarios.
2015-04-28 18:32:02 -07:00
Tigercat2000
6e0bfbbbfa Merge remote-tracking branch 'upstream/master' into okayletstrysomethingslightlydifferent
Conflicts:
	maps/cyberiad.dmm
2015-04-28 14:26:43 -07:00
Tigercat2000
62657448d4 Reintegrate mob fire
I took out the entire on_fire system to work on LINDA. This commit readds
it.
2015-04-28 13:57:58 -07:00
Tigercat2000
9b7b4ae656 Apply most/all of LINDA's updates
This commit ports most, if not all of LINDA's updates on -tg-, and fixes a
few bugs that appear to be unique to paradise's codebase.
2015-04-28 12:45:58 -07:00
Tigercat2000
4f1053f5b7 LINDA, Stage 1
This commit ports the base system of LINDA from TG. This version of linda
is the original version, with none of -tg-'s fixes, rewrites, or other
such improvements attached.

The mob ignite system has been 100% removed, as LINDA does not support
this normally. It may be added back in when the improvements and refactors
to LINDA have been ported.
2015-04-28 08:43:42 -07:00
Fox-McCloud
837538ce95 Reverts a Few Chem Changes 2015-04-27 17:41:13 -04:00
ZomgPonies
50cabacb29 Merge pull request #886 from veganzombeh/vampire
Prevents vampires getting fat by drinking too much blood.
2015-04-27 11:08:02 -04:00
Fox-McCloud
4025495782 Merge remote-tracking branch 'upstream/master' into sofa 2015-04-26 15:10:09 -04:00
ZomgPonies
96d015cc06 Merge pull request #878 from tigercat2000/Curtains
4 Baystation12 PR's
2015-04-26 10:08:06 -04:00
veganzombeh
cf1ac2f602 Fixes #881 and lets vampires gain nutrition from consuming blood reagent.
Fixes #881, vampires should no longer get fat from drinking too much blood. Handle_blood now checks for blood that isn't their own and "eats" it.
2015-04-26 11:33:05 +01:00
Fox-McCloud
55ba0ab60e Better Sofa 2015-04-26 03:43:56 -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
fe6090e569 Merge pull request #868 from Fox-McCloud/carpplush
Carp Plushie Syndies Buff
2015-04-25 15:28:45 -04:00
Tigercat2000
ccfde28c4e First commit of context-based grab from Bay12
This is the first commit to the context based grab system ported from
baystation 12. It includes the first 4 baystation commits. More commits
will be added as their system is developed.
2015-04-25 10:37:01 -07: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
Fox-McCloud
cf82b8db30 Merge remote-tracking branch 'upstream/master' into oldcode 2015-04-25 02:23:38 -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
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
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
e8038738f6 Merge pull request #800 from ZomgPonies/shadow
Mutantrace update
2015-04-21 18:36:24 -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
ZomgPonies
5a51494ca6 Merge pull request #850 from Fox-McCloud/tators
Traitor Item Additions and Surplus Crates
2015-04-21 17:31:34 -04:00
Tigercat2000
d755275599 Make violins and guitars f10 again
This commit makes violins and guitards have a force of 10 again,
because it was complained about.
2015-04-21 04:59:52 -07:00
Fox-McCloud
9885688934 Traitor Item Additions and Surplus Crates 2015-04-21 03:05:12 -04:00
Tigercat2000
3dacab94a8 Adds hitsounds to violin and guitar
they were missing them
now they aren't
fancy sproingy hitsound for guitar
2015-04-20 08:31:55 -07:00
ZomgPonies
8c7eec4c29 Merge pull request #837 from Bram961/Ambience-split
Splitting shipambience.ogg from toggle ambience
2015-04-20 08:24:37 -04:00
ZomgPonies
77534a6fa3 Merge pull request #831 from Fox-McCloud/hostilemobs
TG Spider Port
2015-04-20 08:22:03 -04:00