Commit Graph
15223 Commits
Author SHA1 Message Date
Fox-McCloud 084ed30446 more fixes and features 2017-01-25 01:04:01 -05:00
FalseIncarnate a4037ad426 Rigging Lights and Cells now works with Plasma Dust
Light bulbs, light tubes, and power cells can now be rigged with plasma
dust from grinding plasma sheets as well as the standard plasma reagent
from a chem dispenser. Both reagents require at least 5u of the reagent
to be injected at once to rig the bulb/tube/cell to explode.

If a rigged cell is inserted into a stunprod, it only explodes when you
actually attempt to stun something with it, not when you turn the prod
on. This was unchanged, but I'm mentioning it so people don't think I
changed that.

Fixes #6238

🆑
tweak: Plasma dust can now be used to rig lights and power cells, like
the plasma reagent, with explosive results.
/🆑
2017-01-24 19:47:18 -05:00
Fox-McCloud 36bfee25dc last of the missing stuff, hopefully 2017-01-24 18:33:22 -05:00
Fox-McCloud b1f789e104 fixes a ton of thing 2017-01-24 03:23:16 -05:00
Kyep 1d06b3afca Fox Requests 2017-01-23 23:42:44 -08:00
Fox-McCloud 5b33a72486 fixesssss 2017-01-23 22:39:01 -05:00
Fox-McCloud d0b378892d Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 22:25:00 -05:00
Ar3nn 364a78f013 what 2017-01-23 13:00:43 -05:00
uraniummeltdown 1eec76088b tweaked playercount and decreased morph weight 2017-01-23 21:52:45 +04:00
Ar3nn f1f545d780 Revert "cluwne mask now allows internals"
This reverts commit 42308aa798.
2017-01-23 12:44:48 -05:00
Markolie a7205cfd3e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/projectiles.dmi
2017-01-23 17:36:37 +01:00
Fox-McCloud 4f72f89ad8 podmen fix 2017-01-23 08:05:55 -05:00
Fox McCloudandGitHub 263c95b65c Merge pull request #6234 from FalseIncarnate/bug_fix
Allows shovels/spades to remove soil patches
2017-01-23 06:44:34 -05:00
Fox McCloudandGitHub 2af1f9bb79 Merge pull request #6185 from Allfd/Enforcer
Ports Enforcer handgun, rubber bullets, and new shotgun ammo boxes from Stratus
2017-01-23 06:08:36 -05:00
Fox McCloudandGitHub 9709b4ddfa Merge pull request #6219 from Crazylemon64/tg_mapconflict_helper
Tg mapconflict helper
2017-01-23 06:04:52 -05:00
Fox-McCloud 3e87bd3370 more adjustments and fixes 2017-01-23 05:56:17 -05:00
Fox-McCloud 5c828db250 fixes, comfrey, and aloe 2017-01-23 05:25:42 -05:00
Fox-McCloud ea15a83fde Fires all Lifeguards, Bans Diving, Forbids Swimming, and Restricts Water Useage 2017-01-23 01:56:47 -05:00
Fox-McCloud 7007f6bbdf Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 01:01:09 -05:00
Fox-McCloud dc0710135e more fixes 2017-01-23 00:53:44 -05:00
Fox-McCloud 104bfab759 sprite and code fixes 2017-01-22 23:25:56 -05:00
Fox-McCloud dde14aa78e it compiles 2017-01-22 19:57:03 -05:00
Markolie e9cc69ea3f If check spaces 2017-01-22 19:18:13 +01:00
Markolie d6276ae978 Tiger's comments 2017-01-22 19:15:26 +01:00
Fox-McCloud 706347fd84 even more work 2017-01-22 08:11:31 -05:00
FalseIncarnate be7f7cea37 Allows shovels/spades to remove soil patches
Using a spade (or shovel from mining) on a patch of soil will do one of
two things:
- If there is a plant currently planted in the soil, it will remove it,
freeing up the soil patch.
- If there is no plant present, it will clear away the soil, deleting
the soil patch.

🆑
rscadd: Returns the ability to remove vacant soil with shovels and
spades, and adds the ability to dig up plants in soil to remove them
instantly.
/🆑
2017-01-22 03:24:52 -05:00
Fox-McCloud 10c0e734c3 more work 2017-01-22 01:46:48 -05:00
uraniummeltdown 5fa8d33193 tweaked event delay, enabled morph, enabled immovable rod 2017-01-22 07:07:32 +04:00
Fox-McCloud ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
uraniummeltdown aa9f57b00e slime glass reaction, slimepotions check for proximity 2017-01-21 10:52:25 +04:00
Markolie 2cedb7b20b Remove pooling, minor fixes 2017-01-21 02:48:19 +01:00
Markolie 9619b867ab Implement Fox's changes for tinlux 2017-01-21 00:44:10 +01:00
Markolie 7bd3ede354 Lavaland food fixes 2017-01-21 00:14:09 +01:00
Markolie a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi
2017-01-20 23:43:35 +01:00
Markolie 915ff13bfb Add Lavaland reagents, fix mine lamp luminosity 2017-01-20 23:35:56 +01:00
Fox McCloudandGitHub e0569091c9 Merge pull request #6222 from Markolie/ann2
Announcement fixes
2017-01-19 13:21:18 -05:00
Markolie cedfc2ccbf Announcement fixes 2017-01-19 15:12:20 +01:00
FalseIncarnate 5dcb868cec NODROP and Destroy() considerations 2017-01-19 03:52:11 -05:00
Crazylemon64 d945229fcb Ports over tg's map conflict helping script 2017-01-18 20:27:00 -08:00
Crazy LemonandGitHub 2a209f62cd Merge pull request #5814 from Markolie/ann2
Announcement refactor
2017-01-18 19:17:30 -08:00
Crazy LemonandGitHub 37a7484976 Merge pull request #6149 from FlattestGuitar/log-upgrade
Adds log stacking to admin logs
2017-01-18 19:13:50 -08:00
Crazy LemonandGitHub c16397af3f Merge pull request #6145 from AndriiYukhymchak/teg_reworks
TEG's circulators can now be controlled
2017-01-18 19:04:10 -08:00
Fox McCloudandGitHub 55a255aa40 Merge pull request #6195 from TheBeoni/More-Book-Sprites
More book sprites
2017-01-18 21:22:38 -05:00
Fox McCloudandGitHub ebad512fb6 Merge pull request #6218 from KasparoVy/fat-roundstart-fix
Fat characters now spawn in fat.
2017-01-18 21:20:45 -05:00
uraniummeltdown 22d7731fb3 << -> to_chat 2017-01-19 06:10:43 +04:00
KasparoVy 5b9a5aeb6e Reduced redundancy.
Setting .disabilities and .mutations was made redundany by the use of
SetSEState and domutcheck.
2017-01-18 19:39:49 -05:00
Fox McCloudandGitHub 03e3f1d624 Merge pull request #6169 from Aurorablade/KALIMAH
Bugsie 3
2017-01-18 18:52:19 -05:00
KasparoVy 4a420ef768 Fat characters are now fat. 2017-01-18 18:44:36 -05:00
Fox-McCloud 68c0bea660 customize 2017-01-18 18:38:01 -05:00
Crazy LemonandGitHub deba5d8b95 Merge pull request #6170 from Fox-McCloud/species-lever-options
Adds Species Levers
2017-01-18 15:35:17 -08:00