Commit Graph

921 Commits

Author SHA1 Message Date
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
FalseIncarnate 079b6492fd Candy Fixes
- Fixes the bad rainbow cotton candy not actually using a "toxin" as
it's reagent contents.
- - Previously contained Lexorin, now contains Sulfonal.

- Fixes the candy maker "eating" candy moulds and causing a runtime
while doing so.
- - Incorrect recipes still destroy the mould, but successful candy
making will return it's mould as intended.
2015-04-15 20:12:46 -04:00
Matt 21929eded3 Hydro fix & colorful corgis
Hydro fix, fixes http://www.github.com/ParadiseSS13/Paradise/issue/683
Added corgis random color when splashed with colorful reagent.
2015-04-15 11:31:31 +02:00
Fox-McCloud 17ed330278 typo 2015-04-13 17:14:17 -04:00
ZomgPonies 1b4bfe1196 Removing all mutantrace crap except for slimepeople 2015-04-13 06:20:17 -04:00
Fox-McCloud aaf3be77fb New Vending Machines 2015-04-13 03:27:41 -04:00
ZomgPonies 1be205df11 Shadowpeople update 2015-04-13 01:06:39 -04:00
ZomgPonies 24213e0596 Merge pull request #795 from tigercat2000/ANTAGlogs
Add check for antags in msg_admin_attack
2015-04-12 23:58:11 -04:00
Fox-McCloud 28f0910ee6 [Goonchem] CLF3 Fixup 2015-04-12 21:42:27 -04:00
DZD 00035a51f0 It compiles!
- Makes shadowlings compile, require snowflaking of a few things to the
human Life() proc due to how Bay species works.
- Renames monkeyizing var to notransform, as that's effectively what it
was used for, to prevent transformation. (/tg/ port)
2015-04-12 19:54:45 -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 ea66b972ff Merge remote-tracking branch 'upstream/master' into smoke-fix 2015-04-12 04:53:04 -04:00
ZomgPonies 234d4ae23a Merge pull request #784 from Fox-McCloud/fuckyougit
[Goonchem] Improvised Heating
2015-04-12 04:35:42 -04:00
Fox-McCloud 4908b10dbf [Goonchem] Improvised Heating 2015-04-10 22:44:15 -04:00
Fox-McCloud 55ccddd6c0 [Goonchem] Smoke Fix 2015-04-10 20:30:33 -04:00
Fox-McCloud ea9cb6803f forgot 2015-04-10 07:36:38 -04:00
Fox-McCloud 14ea26fdf8 fixes 2015-04-10 07:10:06 -04:00
Fox-McCloud 286a1ad5df [Goonchem] Food Reagents 2015-04-10 04:46:50 -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 0f2e70aa5c Merge pull request #762 from Fox-McCloud/acid
[Goonchem] Acid Rework
2015-04-09 16:20:48 -04:00
ZomgPonies 68c20e32f7 Merge pull request #759 from Fox-McCloud/temperature
[Goonchem] Reagent Temperatures
2015-04-09 16:20:38 -04:00
Fox-McCloud b8230aefe6 Nukies--Chemsprayer and New Grenades 2015-04-08 23:39:07 -04:00
Fox-McCloud 993529a2b1 tweaking 2015-04-08 19:54:19 -04:00
Fox-McCloud 891af5bbff tweak 2015-04-08 17:51:20 -04:00
Fox-McCloud ff4baf138a Goon temps 2015-04-08 17:41:16 -04:00
ZomgPonies c5dde745dd Merge pull request #764 from Artorp/ChemDispenser
Dispose chems directly from chemdispenser
2015-04-08 16:56:52 -04:00
ZomgPonies 5108942ed9 Merge pull request #752 from TheDZD/smoke
Chemistry Smoke Changes
2015-04-08 16:55:03 -04:00
Artorp e1bc56743c Dispose chems directly from chemdispenser
Makes it possible to dispose chemicals directly from the chem dispenser
2015-04-08 15:15:12 +02:00
Fox-McCloud 44d8e4beb8 [Goonchem] Acid Rework 2015-04-08 06:42:47 -04:00
Fox-McCloud 4bd18261e6 [Goonchem] Reagent Temperatures 2015-04-08 02:44:50 -04: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
ZomgPonies c01b66b787 Merge pull request #749 from Fox-McCloud/more-reagents
[Goonchem] More reagents
2015-04-07 15:49:04 -04:00
Fox-McCloud dec621eefd Revert "R&D Research Levels Unification" 2015-04-07 01:16:19 -04:00
Fox-McCloud ddc3604442 Merge remote-tracking branch 'upstream/master' into more-reagents 2015-04-07 01:15:06 -04:00
Fox-McCloud 68a8340b23 [Goonchem] More Reagents 2015-04-07 01:03:15 -04:00
ZomgPonies 4e9daf6aa8 Merge pull request #746 from jack-fractal/write-research-debug
R&D Research Levels Unification
2015-04-06 23:28:27 -04:00
jack-fractal a0be969870 Unifying tech levels
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
ZomgPonies 81c5451944 Merge pull request #736 from Fox-McCloud/tator-bottle
[Goonchem] Poison Traitor Bottles
2015-04-06 18:13:40 -04:00
Fox-McCloud e1db537443 [Goonchem] Poison Traitor Bottles 2015-04-05 23:37:41 -04:00
Fox-McCloud 340451ba5c anti-meta 2015-04-05 22:08:03 -04:00
Fox-McCloud 9ca8def744 [Goonchem] Fixups 2015-04-05 21:56:59 -04:00
Fox-McCloud 7c739e4745 Merge pull request #710 from ZomgPonies/limb
Port of the BS12 limb overhaul
2015-04-05 19:06:39 -04:00
ZomgPonies 2684a2b999 Merge pull request #733 from tigercat2000/StahpSpawningSpessworm
Prevent life reagent from spawning spaceworms
2015-04-05 19:02:55 -04:00
Fox-McCloud fb03e1bc88 updates 2015-04-05 17:54:48 -04:00
Tigercat2000 1bc73bd054 Prevent life reagent from spawning spaceworms
Spaceworms are specifically designed as an adminbooze mob- they are NOT
currently balanced to be spawned by any reactions or such. They even can
qdel things that they eat.
2015-04-05 21:06:44 +02:00
Fox-McCloud f977b62724 few more tweaks 2015-04-05 05:24:14 -04:00
Fox-McCloud afb8626670 [Goonchem] More Additions and Tweaks 2015-04-05 03:18:18 -04:00
ZomgPonies 91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
Fox-McCloud ddba1a418a [Goonchem] Tweaks 2015-04-04 07:46:00 -04:00
Fox-McCloud ff5ec1df54 meh 2015-04-03 05:32:53 -04:00