Commit Graph

2437 Commits

Author SHA1 Message Date
ZomgPonies e641c847d6 Merge pull request #1233 from Fox-McCloud/stun-balance
Stun+Weaken Balancing
2015-06-01 15:20:19 -04:00
Fox-McCloud e71bcdb9d0 Adds Grenade, Flash, and EMP in-hands 2015-05-31 16:39:41 -04:00
Fox-McCloud e098364432 Stun+Weaken Balancing 2015-05-31 06:35:14 -04:00
ZomgPonies e5f026d02e Merge pull request #1216 from tigercat2000/OHGODIHAVETOTESTTHIS
Port Atlas's implementation of -tg-'s canvas art.
2015-05-30 20:17:41 -04:00
Fox-McCloud 0602435d8a Fixes and Tweaks to Defenses 2015-05-30 01:47:25 -04:00
ZomgPonies 01896f9209 Merge pull request #1208 from tigercat2000/coloredtilelight
Colored Light Tiles
2015-05-29 19:36:56 -04:00
Tigercat2000 cced767094 Port Atlas's implementation of -tg-'s canvas art. 2015-05-29 15:43:42 -07:00
ZomgPonies 277a900aa7 Merge pull request #1193 from Fox-McCloud/mobs-pets-stuffs
Simple Animal Refactor+Update+Fixes and Pet Collars
2015-05-28 22:45:03 -04:00
Tigercat2000 f7ccb2ef79 Colored Light Tiles
Light tiles (item) can now have their color changed by attacking them with a
multitool. These colors have special sprites and glow a color similar to
their sprite.
2015-05-28 16:52:06 -07:00
Fox-McCloud cd112b5364 Wolpin Fix+Monkey Tail Fix 2015-05-28 04:04:39 -04:00
Fox-McCloud 5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
Fox-McCloud 127aff20ba Fixes Rubber Duck 2015-05-27 19:55:35 -04:00
FalseIncarnate a1cce51559 Merge Conflict Fix, Attempt 2 2015-05-27 01:07:19 -04:00
ZomgPonies 5c79a9a065 Small object manipulation stuff 2015-05-26 14:00:20 -04:00
FalseIncarnate c385cb7f4f Botany Belt, Biogenerator Additions
Adds in the new Botany Belt, a belt designed for handling all sorts of
botany-related tools.

Adds the Botany Belt, Security Belt, Medical Belt, Janitor Belt, and
Bandolier to the Biogenerator's list of products.

Re-arranges the biogenerator's product listing to have a new "Belts"
section, dedicated to (you guessed it) belts.
- Moves the Utility (tool) into the Belts section, previously was in the
Leather section
- The new belt listings are also in this section.

All belts in the biogenerator have the same base cost of 300 points.
Increasing the efficiency of the machine will lower the costs
appropriately.

Adjusts some code related to the security belt so they won't magically
have a seclite in them when created via biogenerator.
- The belts in the sec lockers will still have their light
- The ERT belt no longer needs to clear contents during its New() proc
to remove the seclite.
2015-05-26 13:54:24 -04:00
ZomgPonies 264369bdfa issmall fixes and order of operations 2015-05-25 23:50:53 -04:00
ZomgPonies e056abfb82 3/3 port done 2015-05-25 20:16:34 -04:00
ZomgPonies 1935a82afe 2/3 of port done 2015-05-25 19:48:13 -04:00
ZomgPonies f2d03e93c2 First 1/3 of port done. 2015-05-25 17:59:30 -04:00
TheDZD 40d165d9c5 Merge pull request #1165 from Krausus/Fixes-201505250443
Fixes: Mulebots, Catwalks, Flashbangs, Diona Suicide, Traitor Report, Challenge, Runtimes, etc.
2015-05-25 11:20:29 -04:00
Krausus b630ad1e97 Fixes supermatter "glass" shards having bad icons 2015-05-25 09:02:36 -04:00
Krausus 3d8a708286 Fixes camera bugs recursively deleting themselves 2015-05-25 08:53:31 -04:00
Krausus c485b7d45b Fixes flashbang-on-nonhuman runtime 2015-05-25 07:42:53 -04:00
Krausus ef2fc4cb14 Fixes C4 del'ing instead of qdel'ing 2015-05-25 05:10:23 -04:00
Fox-McCloud 1b4c3f797d touch-ups 2015-05-24 01:35:52 -04:00
Fox-McCloud 791ebc0b7f New Race: Canine Race--Vulpkanin 2015-05-24 01:00:19 -04:00
Fox-McCloud 6884e593dd Merge pull request #1139 from tigercat2000/spacearea
Replace all instances of /area alone to /area/space
2015-05-22 18:42:08 -04:00
ZomgPonies c8f9aa0c33 Merge pull request #1140 from Fox-McCloud/tweaking-stuff
Tweaks and Fixes 2.0
2015-05-22 17:24:29 -04:00
ZomgPonies 2d1b8f422e Merge pull request #1128 from Fox-McCloud/LINDA-Fixes
More Linda Fixes
2015-05-22 17:22:20 -04:00
Fox-McCloud db442b4486 RCD Fix 2015-05-22 16:55:41 -04:00
Fox-McCloud 1c1eec3210 Tweaks and Fixes 2.0 2015-05-22 16:29:12 -04:00
Tigercat2000 c6a4fdc374 Replace 2 A.name==Space checks with istypes 2015-05-22 11:23:20 -07:00
Krausus f5a00dcc28 Fixes match attack proc and processing
Fixes their missing attack proc (used to light others' cigarettes) and
matches still processing (and creating hotspots) after being dropped.
2015-05-22 08:43:57 -04:00
Krausus 01b5f09b22 Fixes missing icon/description for used zipties 2015-05-22 08:10:30 -04:00
Fox-McCloud f04dd858cf Merge remote-tracking branch 'upstream/master' into LINDA-Fixes 2015-05-21 19:35:35 -04:00
Fox-McCloud 0da9c966f0 More Linda Fixes 2015-05-21 19:33:54 -04:00
Tigercat2000 e470eee477 TMDU: Mass Driver Overhaul
This commit overhauls mass drivers.
Every component of mass drivers are now buildable.
This means:
 - Mass Drivers
 - Mass Driver Control Computers
 - Mass Driver Buttons
Mass driver control computers now support multiple mass drivers.
You can link mass-drivers to buttons via multitool.
Buttons have a range of 7 for their mass driver link.
Computers have infinite range.
2015-05-19 20:28:48 -07:00
ZomgPonies c11264b11f Merge pull request #1091 from tigercat2000/TAPEEEEE
Duct Tape
2015-05-18 19:27:29 -04:00
Krausus 778b61f7a2 Fixes nanopaste
It can now repair limbs and mechanical organs as intended.
2015-05-18 09:50:45 -04:00
Krausus 13cac3571e Fixes splinting and broken limb dropping
Splints will now work again, on arms/hands/legs/feet, and health
analyzers will warn about unsplinted limbs. Having a broken left arm
will no longer cause you to drop what's in your right hand.
2015-05-18 05:59:31 -04:00
Tigercat2000 a8702efd6b BAYPORT: Duct Tape
This commit ports Duct Tape from bay, alongside a few other changes for
our own code.

Bay12 Features:
 - You can tape paper to.. anything basically, like a sticky note.

Changes from Bay12:
 - Tape is a stack now, and has 10 uses per roll.
 - The guitar recipe now calls for 5 pieces of tape.
2015-05-17 14:11:25 -07:00
ZomgPonies 23a510b743 Merge pull request #1034 from tigercat2000/fluffclean
Clean out unused fluff items
2015-05-16 21:27:11 -04:00
ZomgPonies 572f364da4 Merge pull request #1054 from PJB3005/vg-masterrace
/vg/ Multitool Menu port + More things constructible + AAC
2015-05-16 21:26:54 -04:00
Tigercat2000 7eac7651db Stacks can now build on any simulated turf
This commit lightens the restrictions on stacks, so that they can now
build on any type of /turf/simulated instead of requiring
/turf/simulated/floor.

The primary intent of this commit is allowing people to build on shuttles,
as they are now considerably less "magical", given that they have
lighting, and glass sheets + metal rods already ignore these restrictions.
2015-05-16 11:41:44 -07:00
Tigercat2000 e232eb447c Rename cigs_lighters.dm to cigs.dm, to reflect lighters being seperated 2015-05-16 05:44:22 -07:00
Tigercat2000 0996890e44 Merge remote-tracking branch 'upstream/master' into fluffclean
Conflicts:
	paradise.dme
2015-05-16 05:38:40 -07:00
Tigercat2000 9d91387473 Fluff item restoration - Flasks, Lighters
This commit readds every fluff lighter to a new lighters.dm file, as well
as moving every lighter into it. There are enough to justify seperating it
from cigs_lighters.dm. Fluff lighter paths have not been touched for
compatibility to the database and map.

This commit also readds the flasks, with the fluff paths removed.
2015-05-16 05:36:56 -07:00
ZomgPonies 59ed4f69ad Merge pull request #1080 from tigercat2000/WHYDOTHESEKEEPSWITCHING
FIX: Attack logs being backwards
2015-05-16 07:52:33 -04:00
Tigercat2000 b7e5aa5597 FIX: Attack logs being backwards
This commit fixes attack logs being backwards on some erroneous add_logs
arguments.

Things fixed:
 - Martial arts
 - EMP Flashlight
 - Defibrillator
 - C4
 - Handcuffs
 - Resonant Fields
 - Alien Larva attack_animal
 - Mobs being grabbed
2015-05-16 04:41:37 -07:00
ZomgPonies 6bfd92b16a Merge pull request #1061 from FalseIncarnate/wizard
Brooms, Stick-horses, and Flying Wizards!
2015-05-16 07:34:22 -04:00