cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-19 18:17:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,828 Commits 17 Branches 2 Tags
3b072b5a626cc7f58ee8e44a726657ba2f90ff42
Commit Graph
131 Commits
Author SHA1 Message Date
Markolie efb45ea228 Table crafting refactor 2015-02-22 01:50:57 +01:00
DZD fbd9c367c0 NODROP flag addition & handling 
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
 2015-02-18 13:22:41 -05:00
DZD b3a0c9a975 Removes TABLEPASS and FPRINT flags 
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
 2015-02-10 17:41:37 -05:00
Markolie ced499edc3 Vox Heist port from Bay 2015-01-10 06:21:21 +01:00
Markolie 266b4cb113 R&D UI rework 2014-12-22 17:38:22 +01:00
Markolie da8115dc2e Bug fixes 2014-12-20 16:27:33 +01:00
Markolie 7359061678 Bug fixes 2014-12-10 04:47:24 +01:00
Markolie b64a09ec6c Fix grilles 2014-11-21 19:15:42 +01:00
GinjaNinja32andZomgPonies 0427641d89 Moved all shard code to one file. Fixed #5992 
Conflicts:
	code/defines/obj/weapon.dm
	code/game/objects/items/stacks/sheets/glass.dm
 2014-08-16 21:43:38 -04:00
Artorp d0447f061a Fixes states of onedirectional windows 
Will only change the reinforced plasma window. You don't have to pry
them out of a frame before anchoring them anymore.
 2014-08-11 01:51:10 +02:00
Artorp 048f5235c9 Plasma construction and full window fixes 
- Fixed plasma window construction

- Fixed full windows from stopping players and gasses from moving above
them even with density set to 1
 2014-08-11 01:06:27 +02:00
ZuhayrandZomgPonies c0ba021bcd Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 
Conflicts:
	code/datums/supplypacks.dm
	code/game/machinery/hydroponics.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/tgstation2.dmm
 2014-07-26 14:03:46 -04:00
ZomgPonies b33df4745c Removed deprecated power generation stuff (AM, RUST) to free up more procs 2014-07-25 11:33:37 -04:00
ZuhayrandZomgPonies ebb9f724aa Hydroponics rewrite, details will be in PR. Big commit. 
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/game/gamemodes/events/spacevines.dm
	code/game/machinery/seed_extractor.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/mob.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	icons/obj/hydroponics.dmi
	maps/tgstation2.dmm
 2014-07-25 11:10:01 -04:00
mwerezakandZomgPonies 87e7c32959 Fixes advanced trauma kits claiming to disinfect but not doing so 
Conflicts:
	code/game/objects/items/stacks/medical.dm
 2014-07-13 08:18:16 -04:00
mwerezakandZomgPonies b64441cb26 Fixes FEA temperature_expose() being used... 
...instead of ZAS fire_act().

Conflicts:
	code/game/gamemodes/blob/theblob.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/window.dm
	code/game/turfs/simulated/walls_mineral.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/reagents/reagent_dispenser.dm
 2014-06-22 02:03:42 -04:00
Bone White c353e263f4 Surgery table now constructed from plasteel x 5 2014-06-17 16:13:01 +01:00
ZuhayrandZomgPonies a80c317cbe More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron. 
Conflicts:
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/supplyshuttle.dm
 2014-06-15 07:58:00 -04:00
ZomgPonies 2097bed55d 3rd mining overhaul commit, fun KEPT. 2014-06-15 07:52:52 -04:00
ZomgPonies d31a39256e 2nd mining overhaul commit. Fun KEPT. 2014-06-15 07:45:27 -04:00
ZuhayrandZomgPonies ef59deb928 First pass on ore distribution map and stationary drilling rig. 
Added sprites for stationary drilling gear.
Added skeleton ores for coal, adamantine, mythril. Updated some icons. Expanded mining rig functionality.
Changed adamantine and mythril to osmium and metallic hydrogen.
Added ore distribution map generation to master controller.
Added upgrading to stationary drills, tweaked other stuff.
Rewriting the ore processor and how ores handle information. Also rewrote the ore stacker.

Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/modules/mining/coins.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/minerals.dm
	code/modules/mining/satchel_ore_boxdm.dm
 2014-06-15 07:35:17 -04:00
ErthiloandZomgPonies ee56d75f52 Bandage Typos. 2014-06-08 17:38:06 -04:00
d3athrowandZomgPonies d7b67f6b16 This wasn't needed apparently. 2014-05-28 08:45:44 -04:00
d3athrowandZomgPonies c50eb1217b Tested and Fixed #826 
Conflicts:
	code/game/objects/items/stacks/stack.dm
 2014-05-27 14:21:57 -04:00
ZuhayrandZomgPonies 1af09fbfba Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable. 
Conflicts:
	baystation12.dme
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/projectiles/guns/projectile/bow.dm
	icons/obj/gun.dmi
 2014-05-12 02:59:53 -04:00
ZuhayrandZomgPonies d606d774d8 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 
Conflicts:
	baystation12.dme
	code/controllers/configuration.dm
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/examine.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/recycling/disposal.dm
	icons/mob/robots.dmi
	icons/obj/device.dmi
 2014-05-12 01:41:02 -04:00
ESwordTheCatandZomgPonies 3c3e4c7dc8 Heh forgot these. 2014-05-03 22:54:24 -04:00
ESwordTheCatandZomgPonies 532298c725 Tweak object pool system. 
Conflicts:
	code/game/objects/structures/grille.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/projectiles/projectile/special.dm
 2014-05-03 22:54:09 -04:00
ZuhayrandZomgPonies 7fe9b670f3 Fix for previous commit. 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
 2014-05-03 17:35:55 -04:00
ZuhayrandZomgPonies 9ec5a18e0b IPC will no longer take damage from walking in glass. Not sure why this was happening beforehand. 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
 2014-05-03 17:34:43 -04:00
ESwordTheCatandZomgPonies c43652b33a Okay shards converted to pool usage now. 
Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/objects/structures/displaycase.dm
	code/modules/mining/mine_turfs.dm
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
 2014-04-19 19:57:53 -04:00
ESwordTheCatandZomgPonies 907971e8ab Grille complete pooling. 2014-04-19 19:42:55 -04:00
ESwordTheCatandZomgPonies 424df5eaf7 We object pool grille now. 2014-04-19 19:42:42 -04:00
ESwordTheCatandZomgPonies dde219a581 Object pooling immature implementation. 
Conflicts:
	code/__HELPERS/experimental.dm
 2014-04-19 19:42:04 -04:00
Rob NelsonandZomgPonies 9227481a8a Standardize windows. 
Conflicts:
	code/WorkInProgress/buildmode.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/twohanded.dm
	code/game/objects/structures/window.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
 2014-04-19 19:36:33 -04:00
VelardAmakarandZomgPonies dc6f794368 Adds the ability to construct, destroy, and take apart bookcases. 
Bookcases can be built using 5 wood planks.
Bookcases can be destroyed using weapons(50HP).
Bookcases can be taken apart using a wrench.
 2014-04-19 19:13:33 -04:00
ZomgPonies 207959cc7d crash fix 2014-02-28 21:31:59 -05:00
ZomgPonies 1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
Jesus Hussein ChrisandZomgPonies 95f7280781 Generic attack sounds for all melee weapons 
Overrides the generic sounds with more suitable ones where needed.
Weapons that do no damage don't have sound effects.

Conflicts:
	code/game/gamemodes/wizard/artefact.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/game/objects/weapons.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
 2014-01-22 10:15:43 -05:00
ZomgPonies cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
Pete GoodfellowandZomgPonies 331cf1df95 Updated all suicide_act()s to use a new span class, 'suicide'. 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/modules/hydroponics/growninedible.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
	code/stylesheet.dm
 2014-01-19 21:25:47 -05:00
NanaiandZomgPonies 69e713c04a Surgery Update 
Proper repair surgery for internal organs- Scalpel replaced by membranes from advanced kits, robotic hearts have a separate surgery.

Conflicts:
	code/modules/surgery/ribcage.dm
 2014-01-04 15:44:23 -05:00
ZomgPonies dcaeea24bf Adding large cardboard boxes 2013-12-25 07:06:13 -05:00
ZomgPonies 85e75ca052 Walking on glass shard fix 2013-12-14 20:02:32 -05:00
alex-gh 270d5c24a7 Placing tiles on a space turfs no longer results in unsimulated platings 2013-12-11 00:40:10 +01:00
ZomgPonies abcfa2fce0 Crate fixes 2013-11-30 07:58:18 -05:00
ZomgPonies 6467bbbb39 Added growing and rolling your own weed, tobacco, tea, coffee 2013-11-27 16:51:04 -05:00
ZomgPonies 887e172a26 More asteroid unsim fixes 2013-11-23 06:55:46 -05:00
alex-gh 2c2dfdc820 Allow for creation of stacks with amount = 0 2013-11-13 18:33:57 +01:00
ZomgPonies 05955bb230 Added plasma windows 2013-11-02 04:03:07 -04:00