Commit Graph

488 Commits

Author SHA1 Message Date
KasparoVy b589d5613a Deconstructing or depowering ORMs/MEVs ejects whatever ID is inside. 2017-03-21 17:44:18 -04:00
Markolie acab5d5170 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz
# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/game/objects/items/weapons/storage/uplink_kits.dm
#	code/game/objects/items/weapons/storage/wallets.dm
2017-03-08 10:45:16 +01:00
Fox McCloud f96c335d1f Merge pull request #6704 from uraniummeltdown/hardsuit
Rename all "rigs" (hardsuits) to hardsuits
2017-03-07 23:35:07 -05:00
uraniummeltdown dc6f9f5506 rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands 2017-03-07 20:55:43 +04:00
Markolie 3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Fox-McCloud 41d4c83f17 Refactors Money 2017-03-06 04:52:03 -05:00
Markolie 9d9e957df1 Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold 2017-03-05 19:53:20 +01:00
Crazy Lemon 5e1bd050f8 Merge branch 'master' into adminin 2017-03-03 23:23:40 -08:00
uraniummeltdown f5de924915 use multitool on open panel orm to change dir of input and output 2017-03-02 18:04:10 +04:00
Markolie 389890bb2d Additional admin interaction additions 2017-02-21 13:26:18 +01:00
Markolie 56dd8b189e Proper fix for minebot damage issue 2017-02-15 17:23:57 +01:00
Markolie 519749cf8d Fix OP minebots, move them into a separate file 2017-02-15 16:21:04 +01:00
uraniummeltdown 3df3688e72 move all crates to crates.dmi 2017-02-11 17:44:20 +04:00
Markolie c6559c7d9e Fix to_chat 2017-02-11 05:13:28 +01:00
Markolie 0790ed5f8d KA fixes, upgrade typo fix 2017-02-08 02:45:13 +01:00
Markolie f1254dc7c7 Paradox bag/wisp fixes 2017-02-08 02:21:40 +01:00
Markolie 8ac7ea4dee Soul stone QoL update, paranormal hardsuit fixes 2017-02-08 01:27:00 +01:00
Markolie 18688e6142 I can uncomment you now 2017-02-06 20:51:08 +01:00
Markolie 5deafdb4e5 Fix Destroy() return, replace set_dir with setDir 2017-02-06 20:44:12 +01:00
Markolie 1d6754728b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi
2017-02-06 20:37:03 +01:00
Markolie 8e4439c7f1 Add immortality talisman, add final items 2017-02-06 20:08:52 +01:00
Markolie 7a4c33bbcd Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions 2017-02-06 19:55:37 +01:00
Markolie 2a23862c6a Kinetic accelerator update, other fixes 2017-02-06 18:39:03 +01:00
Fox McCloud 051ce5a78c Merge pull request #6333 from uraniummeltdown/oreboxscanner
Use advanced mining scanner on ore box to interact with it
2017-02-06 05:10:35 -05:00
Markolie ee3417f19a Update chance 2017-02-06 01:42:59 +01:00
Markolie dbe1284214 Adds ship in a bottle/lavaland boat, paranormal ERT spacesuits, update the sord 2017-02-06 01:42:32 +01:00
Markolie 72aec0f9f1 Add shared storage and godeye items, split Lavaland loot files 2017-02-06 01:02:03 +01:00
Markolie b17dca7c57 Prevent signing own blood contract, prevent megafauna from healing on station, prevent hierophant teleports from going to Central Command 2017-02-05 20:36:04 +01:00
Fox-McCloud 390f6768b3 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-02-05 05:26:46 -05:00
uraniummeltdown 3d831b179b hit ore box with advanced mining scanner to interact with it 2017-02-05 09:30:01 +04:00
Markolie a653732219 Sound fixes 2017-01-27 17:47:56 +01:00
Markolie ab4703623c Review changes 2017-01-27 17:46:38 +01:00
Markolie d6276ae978 Tiger's comments 2017-01-22 19:15:26 +01:00
Fox-McCloud ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
Markolie 2cedb7b20b Remove pooling, minor fixes 2017-01-21 02:48:19 +01:00
Markolie 915ff13bfb Add Lavaland reagents, fix mine lamp luminosity 2017-01-20 23:35:56 +01:00
Markolie f85e8fe551 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi
2017-01-11 23:11:29 +01:00
Crazylemon64 3e141ebbb7 Mining drones now are able to use meson sight again
Mining drones now can activate mesons
2017-01-10 23:37:49 -08:00
Markolie e2c60c2bdb Add shapeshift spell, human_req/nonabstract_req support and make Ashdrake reward a shapeshift. 2017-01-06 17:02:38 +01:00
Markolie 01f2c85347 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi
2016-12-23 19:32:19 +01:00
Crazylemon64 6d3e66f41c Polishes up the reset_view proc, which is basically
`reset_perspective` from tgstation.

Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things

Recommit because we're using different compiler versions
2016-12-21 17:56:57 -08:00
TullyBurnalot 1afdfe3933 Adresses the forceMove(src)
- See above title
2016-12-07 18:03:45 +00:00
TullyBurnalot e23b10081e Maintanability of powered checks
- Powered check no longer blanket bans everything but deconstruction
2016-12-07 12:45:57 +00:00
TullyBurnalot d865b601d8 Unpowered Mining Machine Deconstruction
- Both the Mining Vendor and the ORM can now be deconstructed when
unpowered
2016-12-07 11:17:34 +00:00
TullyBurnalot a2bde2d187 Mining Vendor no longer gobbles up IDs
- When unpowered, Mining Vendors no longer accept IDs
2016-12-07 10:51:43 +00:00
Markolie c86b689d5f Remove duplicate ghost check 2016-11-02 12:23:48 +01:00
Markolie 0fa43f7f41 Hopefully final magic fixes, and fixes the possessor 2016-10-25 23:32:35 +02:00
Markolie dbc73875d7 Fix spells, shadow/Diona QoL improvements (HUD icons) 2016-10-25 18:11:09 +02:00
Markolie e5c4b78f47 Add Colossus, add outdoors variable to areas and update fireball targeting 2016-10-25 04:10:52 +02:00
Markolie 5ace926e42 Added Bubblegum. Added dismemberment chance to bullets, and made changes to GPS tracking. 2016-10-25 00:50:31 +02:00