Commit Graph

4126 Commits

Author SHA1 Message Date
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
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
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
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
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
Fox-McCloud
55ba0ab60e Better Sofa 2015-04-26 03:43:56 -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
Fox-McCloud
7a2854ba98 Carp Plushie Syndies Buff 2015-04-24 01:40: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
77534a6fa3 Merge pull request #831 from Fox-McCloud/hostilemobs
TG Spider Port
2015-04-20 08:22:03 -04:00
ComicIronic
44aa2ba225 Code rework of placing things on walls.
Stuff goes under types.
Types have procs.
Never have 500 lines of repeated code again.

I came very close to crying while editing this. You should appreciate
that.

----

This commit entirely reworks how placing things on walls work- Posters
have intentionally been left alone to reduce the amount of lines
changed. With this commit, wall-mounted objects are no longer snowflaked
into the wall file.
2015-04-19 14:29:42 -07:00
Fox-McCloud
af925be951 TG spider port 2015-04-18 10:41:04 -04:00
Fox-McCloud
df94ccb855 fix for infinite explosions 2015-04-17 23:07:22 -04:00
Fox-McCloud
33233941d5 [Goonchem] Reagent Decals 2015-04-17 18:27:49 -04:00
ZomgPonies
98af2982c8 Merge pull request #820 from tigercat2000/Spraycans
Adds spraycans, fixes lipstick, modifies scleaner
2015-04-16 16:39:19 -04:00
ZomgPonies
e2b47e8eab Merge pull request #817 from tigercat2000/SMASHtable
Makes glass tables smash when someone is tabled
2015-04-16 16:37:57 -04:00
ZomgPonies
ee5961d73e Merge pull request #793 from Fox-McCloud/chainsaws
Adds in Chainsaws
2015-04-16 16:36:20 -04:00
Fox-McCloud
d250e38067 Merge pull request #811 from Artorp/electricchair
Electric Chair update
2015-04-16 00:20:10 -04:00
Sawu
d038a0710c Adds spraycans, fixes lipstick, modifies scleaner
This commit does the following:
 - Adds spraycans as a subtype of crayons.
   - Slight crayon overhaul to make room for this
   - Can spray graffiti, runes, and letters on floors & walls
   - Can spray mobs and paint their face

 - Fixes & overhauls lipstick
   - Lipstick is now overlay and Blend() based.
   - Also fixes a few bugs with the system.
   - Updates paper code to accomodate for wiping off spraypaint as well

 - Slight modification to space cleaner
   - Space cleaner now cleans your face of lipstick and spraypaint
2015-04-15 17:19:08 -07:00
Tigercat2000
796695a56b Makes glass tables smash when someone is tabled
This commit does the following:
 - Fixes a minor spelling mistake.

 - Moves glass tables breaking into a proc, was messy otherwise.

 - Changes grab-smash behavior. 'Tabling' someone will now smash the
   glass table, and weaken them for about the same length as a baton.
2015-04-15 12:59:31 -07:00
Artorp
1061bddc35 Added electric chair to map 2015-04-14 23:50:55 +02:00
Artorp
949a6349a2 Electric Chair update
- Changed toggle verb into activation verb
- Added support for spawned/mapplaced e-chairs
- Fixed activation animation
- Fixed updating of icon
- Buffed damage, victim will die much quicker
- Removed stun
2015-04-14 21:36:22 +02:00
Tigercat2000
acc3755a98 Adds glass tables, glass table frames
This commit adds glass tables (credit to WalterJe of -tg-'s fourms for
the sprites) to the game. These can be constructed with two metal
sheets, and two glass sheets. Flipping the table causes it to shatter
and deconstruct itself. You can deconstruct the table at any stage
with a wrench.
2015-04-13 06:29:05 -07:00
Fox-McCloud
d04b9ad0de tweak 2015-04-12 19:57:27 -04:00
Tigercat2000
29c59bd51b Add check for antags in msg_admin_attack
This commit first adds a new helper proc labeled isAntag(), as well as
adding a check for antags for every instance of msg_admin_attack().

Goals of this commit:
 - Make admin ATTACK: logs indicate if attacker is an antagonist.

Note; High probability of merge conflicts, 47 files changed.
2015-04-12 08:41:53 -07:00
Fox-McCloud
421c27b4e4 chainsaw fixups 2015-04-12 07:44:11 -04:00
Fox-McCloud
ff0f29c5e5 Chainsaws 2015-04-12 04:47:17 -04:00
Remie Richards
0f7b09ef07 Procedural Map Generator System
This commit adds a Procedural map generating system for code and admins to
use ingame. The system is modular, which means that it is fairly easy to
make new generating systems. Currently, only the 'nature' unsimulated
system is implemented, as a testing verb for admins to use. Admins can
define the starting XYZ and ending XYZ of the generated system.

Players - This means you may see content that is truely random, in the
future.

Coders - This system allows you to randomize map elements. Writing new
modules is documented at
code/modules/procedural-mapping/mapGeneratorReadme.dm
Detailed information about how the system works, and how it can be
integrated is also avalible there.

Admins - This system will allow you to, at the touch of a button, create
very complex structures and turfs that would otherwise require being
spawned in manually, one by one. The nature button is a fairly good
example of this, with it's randomized grass textures, randomly placed
trees, and randomly placed rocks. This would normally take a good 5
minutes to do, spawning the trees and rocks and turfs, but it takes about
20 seconds to enter the coordinates and have it be completely random.
2015-04-11 05:28:10 -07:00
ZomgPonies
e3050f5cc1 Merge pull request #771 from Fox-McCloud/nukies
Nukies--Chemsprayer and New Grenades
2015-04-09 16:22:19 -04:00
ZomgPonies
e384ff688b Merge pull request #772 from tigercat2000/IDfix
Fix ID examine gender, Agent card overhaul
2015-04-09 16:21:32 -04:00
ZomgPonies
00b2ad3fbd Merge pull request #770 from TheDZD/muh_valids
Anti-Meta Paraphernalia
2015-04-09 16:21:17 -04:00
Tigercat2000
173d746214 wow I left an entire unused proc in I am so good at this 2015-04-09 05:20:55 -07:00
Tigercat2000
eeed80e120 Fix ID gender, bit of an agent-ID overhaul 2015-04-09 05:10:41 -07:00
Fox-McCloud
b8230aefe6 Nukies--Chemsprayer and New Grenades 2015-04-08 23:39:07 -04:00
ZomgPonies
31ed63c384 Merge pull request #763 from tigercat2000/minorannoyances
Fix a minor annoyance with alien nests
2015-04-08 22:53:21 -04:00
DZD
395e4b2cad Don't kill me please
- Changes cattle prod to w_class 4, meaning it can no longer fit in
backpacks.
2015-04-08 18:41:35 -04:00
DZD
d4616a8436 Goddamit git 2015-04-08 18:25:37 -04:00