Commit Graph

2334 Commits

Author SHA1 Message Date
Fox-McCloud 5aada8a9a3 Merge pull request #906 from Krausus/NicotineAddiction
Cigarette Fixes/Tweaks
2015-05-02 23:29:49 -04:00
Krausus c000cb4c78 Doubles cigar(ette) capacity, tweaks base nicotine 2015-05-02 23:08:17 -04:00
Krausus f6ad960f60 Allows synthetics to get reagents from cigarettes 2015-05-02 22:43:44 -04:00
Krausus 21b92a80f9 Tweaks cigarette reagent depletion message 2015-05-01 22:46:53 -04:00
Krausus 73983dc433 Fixes putting cigars and pipes into cigarette packs 2015-05-01 04:28:18 -04:00
Krausus e5f0d0bb6a Changes nicotine pre-generation and fixes lacing 2015-05-01 01:41:19 -04:00
Krausus d2588f64ec Fixes some code that was triggering Goofball 2015-04-30 23:12:28 -04:00
Krausus 7651325497 Reverts nicotine addiction changes 2015-04-30 22:30:53 -04:00
Krausus 96f2a087ad Re-adds passive nicotine comment
Thanks for eating my comment, git.
2015-04-30 09:26:14 -04:00
Krausus 54b979eb34 Adds nicotine addiction to smokables 2015-04-30 09:22:21 -04: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
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 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
ZomgPonies 96d015cc06 Merge pull request #878 from tigercat2000/Curtains
4 Baystation12 PR's
2015-04-26 10:08:06 -04: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
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
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 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 ee5961d73e Merge pull request #793 from Fox-McCloud/chainsaws
Adds in Chainsaws
2015-04-16 16:36:20 -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 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
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
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
DZD b5c84a6818 RIP meta
- Adds bite sounds and attack verbs to the toy carp plush.
- Adds in a foam armblade, obtainable from vending machines, in_hand
looks like a changeling armblade, but the item icon does not.
- Toy flash, makes the flash noise, always outputs the successful flash
noise to the screen, but does not actually do anything outside of that.
2015-04-08 18:15:14 -04:00
Tigercat2000 f026083397 Obtainable dice and D&D figures
- Adds D&D figure box to library
 - Adds both full dice set box and D&D figure box to cargo store
2015-04-08 15:03:43 -07:00
Tigercat2000 32687467bb Merge remote-tracking branch 'upstream/master' into tgdice 2015-04-08 14:51:55 -07:00
ZomgPonies 800b42f315 Merge pull request #751 from tigercat2000/Guitar
Ports Guitar from UristMcStation
2015-04-08 17:49:32 -04:00
ZomgPonies d951f999b9 Merge pull request #754 from tigercat2000/DndMinatures
D&D Minifigures!
2015-04-08 16:55:31 -04:00
ZomgPonies 5108942ed9 Merge pull request #752 from TheDZD/smoke
Chemistry Smoke Changes
2015-04-08 16:55:03 -04:00
Tigercat2000 3eb1339a65 -tg- Dice overhaul 2015-04-08 03:42:44 +02:00
DZD 810d626700 Smoke changes
- Changes smoke so that it immediately affects all mobs in its area of
effect, smoke clouds are purely visual.
- Any mobs in the area of effect of a smoke reaction will be affected by
the smoke's touch reaction, and have all reagents in the smoke container
transferred into them.
- Smoke clouds are no longer opaque.
- Mixing 10u potassium, 10u sugar, and 10u phosphorus or higher will
cause an area of effect with a radius of 3 from the point of reaction.
Any less will have a radius of 2.
- Same with heating 10u smoke powder.
- Smoke powder reaction now only yields 1 powder instead of 3.
- Vent clog event has a radius 3 area of effect.

Fixes and uncommenting

- Uncomments honey turf reaction.
- Uncomments synthflesh turf reaction.
- Adds list for reagents to not copy via smoke (or more specifically,
delete when a smoke reaction happens without copying). This includes
sugar, phosphorus, potassium, and the smoke "reagent" produced in a
smoke reaction.
2015-04-07 20:30:01 -04:00
setheri 705790298a Implemented Wellington's D&D miniatures. 2015-04-08 01:52:22 +02:00