Commit Graph

37 Commits

Author SHA1 Message Date
Mark van Alphen
2618def9a1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	_maps/map_files/Delta/delta.dmm
#	_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
#	_maps/map_files/MetaStation/z4.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
#	_maps/map_files/RandomZLevels/spacebattle.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
#	_maps/map_files/cyberiad/z4.dmm
#	_maps/map_files/cyberiad/z6.dmm
#	_maps/map_files/generic/z5.dmm
#	code/__DEFINES/misc.dm
#	code/__HELPERS/unsorted.dm
#	code/game/objects/structures/lattice.dm
#	code/game/turfs/space/space.dm
#	code/modules/mob/mob.dm
#	code/modules/ruins/ruin_areas.dm
#	paradise.dme
2019-05-08 21:40:35 +02:00
Mark van Alphen
d98eb14a39 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme
2019-05-04 03:16:38 +02:00
Mark van Alphen
f3fb39b339 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
# Conflicts:
#	code/__DEFINES/misc.dm
2019-05-04 03:07:36 +02:00
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Mark van Alphen
429dd20ded Button plane fix 2019-04-23 20:08:04 +02:00
Mark van Alphen
f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme
2019-04-10 21:54:54 +02:00
Arkatos1
52a051f7e9 Code improvement 2019-04-05 20:13:13 +02:00
Arkatos1
a364d2d032 Descriptions now shows with mouse hover over action buttons 2019-04-05 20:11:41 +02:00
Mark van Alphen
f75de97c6e Port over Corn and affected's work on Lavaland
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
Co-authored-by: CornMyCob <xxxxbarryscottxxxx@gmail.com>
2019-04-01 23:41:32 +02:00
variableundefined
4de3d741a5 Merge pull request #10449 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/let-there-be-light
fixes lightning
2018-12-13 09:37:58 +08:00
Joe Schmoe
3a7e06960a fixes lightning 2018-12-12 22:40:45 +01:00
variableundefined
2f73a6ecb1 Merge pull request #10390 from MarsM0nd/Radial_Implants
Radial menu for implants and item_action icon.
2018-12-11 20:37:45 +08:00
Mars
7841d851f6 Item_action customizing icon + custom icons for arm implants 2018-12-01 13:42:38 +01:00
Citinited
6354631937 Fixes lots of items not being taped by duct tape; tape won't be applied to bags if it can be inserted 2018-12-01 00:13:21 +00:00
Citinited
88ff4eb49f Some fixes for taping, also bumps up max_amount for tape rolls and adds a tape supply pack 2018-11-28 22:21:59 +00:00
Citinited
05b9955f2b You can stick duct tape to more than just paper now 2018-11-25 23:03:10 +00:00
tigercat2000
6028fc83c3 Not quite done yet 2018-10-30 22:57:42 -07:00
Crazylemon64
cbd52db2be A couple buildmode fixes
The runtime when not placing a valid path is now replaced with a warning
message

The HUD icon for buildmode is no longer covered up by item actions
2018-07-26 21:47:40 -07:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
alexkar598
ad97972038 Adds a var to not use item icons and insteed use the icon supplied in the subtype,defaults to using the item icon.Also removes empty file 2018-03-22 16:19:38 -04:00
Fox-McCloud
d7da6cb94c Adds a Bunch of Instruments 2017-08-02 03:19:03 -04:00
Fruerlund
7b7fcf643a Adds action buttons
The chem scanners will now use action buttons instead
2017-05-22 11:08:43 +02:00
Fox-McCloud
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
KasparoVy
3c24f6e255 Dumbs Down Plasmaman Suit Reloading & Amends Plasmaman Suitless Ignition
Plasmaman suits no longer have an in-depth system by which their
autoextinguisher can be replenished, but a simple one.

Plasmamen now combust in the same circumstances regular gasous plasma
will as defined in LINDA code.
2017-02-24 02:37:20 -05:00
KasparoVy
9dad350329 Desnowflakes the Special Reagent Handling & Amends+Completes Autoextinguish & Fixes Plasmaman Immolation Immunity Bug
- Moved Vox and Plasmamen special reagent handling to the Species datum
to avoid snowflaking in reagent code
- Removed the AUTOEXTINGUISH flag and turned it into a var to conserve
flags
- Adds Plasmaman EVA suit auto-extinguisher reloading. Eject the
depleted cartridges with an action button and fill them as you would a
fire extinguisher, then just slot them back into the suit.
- Fixes a bug where having NOBREATHE cured a Plasmaman of burning when
exposed to atmosphere.
- Fixes a bug where Plasmamen would burn in space or in totally-Plasma
environments. Inspired by /vg/station.
2017-02-22 00:12:01 -05:00
Markolie
f61cfb47b9 Part three: The Hierophant. Also minor fixes for the other bosses. 2016-10-24 21:39:40 +02:00
Markolie
52355cba9d Added Legion megafauna, updated weather and some minor other refactors/changes. 2016-10-24 02:16:45 +02:00
TheDZD
35b03d23e7 Merge pull request #5454 from Fox-McCloud/object-verbs
Removes A Few Object Verbs
2016-08-17 17:42:24 -04:00
Fox McCloud
eda5549d2d Merge pull request #5382 from Ty-Omaha/Features
Allows Sechailer Phrases to be Selectable
2016-08-14 22:28:56 -04:00
Fox-McCloud
4c93215158 Removes A Few Object Verbs 2016-08-14 21:37:24 -04:00
Ty-Omaha
35ccf346a7 Stuff 2016-08-10 21:47:37 -04:00
Ty-Omaha
96d45c4505 Sechailer1 2016-08-08 22:32:50 -04:00
Fox-McCloud
f5826a0c2b Adds in Headphones 2016-08-06 19:55:08 -04:00
Fox-McCloud
473f2498a0 well then 2016-07-21 07:22:06 -04:00
Tigercat2000
7a07573e12 Fix latejoining mimes, spacing, Grant/Remove casting 2016-07-19 07:59:52 -07:00
Tigercat2000
56a09db739 Action Button Update
- Refactors action button backend
   - Action buttons are no longer checked on Life(), items are responsible
     for adding/removing/updating them.
   - Item action buttons are no longer a static action_button_name define,
     items define actions_types, which is a list of paths.
   - Items can now have multiple action buttons.
     - This is handled by new arguments to ui_action_click, the first
       parameter is the user, the second is the path of the action datum
       that was invoked.
 - Refactored how internals function
   - You may now directly switch internals without breaking anything.
   - The internals icon has been updated to be more consistent.
 - Added action buttons for jetpacks
 - Added action buttons for oxygen tanks
 - Uses-based implants now qdel() themselves when they run out of uses.
   This is somewhat a buff to traitor implants, but it's such a minor
   change. The actual reasoning is so that the action buttons are properly
   removed.
 - Fixed a bug with the "Boo" spell which resulted in IsAvailable failing
   for certain ghosts.
 - You can now shift-click on movable HUD elements to reset them to the
   proper position (thank fucking christ)
2016-07-18 13:23:01 -07:00