cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-16 08:37:41 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
1698 Commits
Author SHA1 Message Date
SamCroswell 8b16d394ed Projectile Laser Update 
Lasers are now projectiles instead of instant beams. Fire delay removed,
damages adjusted accordingly.
 2014-11-26 19:16:21 -05:00
Fox-McCloud 261157cb58 AI, PDA, and Other changes 2014-11-26 01:18:49 -05:00
Markolie 107325bb43 Melee attack for mechs 2014-11-22 06:05:13 +01:00
Markolie 9bd63e8c84 Upping the research levels for the Phazon 2014-11-22 05:35:09 +01:00
Markolie 2c2c7fc517 Constructable Phazon, constructable display case 2014-11-22 05:15:44 +01:00
Markolie e0234565bc Remove the duplicate decloner 2014-11-22 00:37:55 +01:00
Markolie 1269fe7d4e Fix encryption key name 2014-11-21 23:58:13 +01:00
Markolie 7415d1be99 Add the decloner to R&D 2014-11-21 21:50:01 +01:00
Markolie 3d806081d0 Let protolathe's be loaded with chemicals again, let circuitprinter drop chemicals when deconstructed 2014-11-21 21:39:43 +01:00
Markolie 5b3df5a690 Fix names of scanning modules 2014-11-21 19:40:31 +01:00
Markolie 59edf2701d Makes SMES'es and Vending Machines constructable and upgradeable, gives borgs recorders 2014-11-18 20:36:40 +01:00
Markolie 3e67587869 Allows the freezer/heater to actually be connected, minor machine fixes, janitor mop fix, drone can now clean bottles 2014-11-18 17:31:43 +01:00
Markolie 2f7d3ae26d Additional constructable and upgradeable machines, adds soap to drones, updates teleporter 2014-11-18 03:13:12 +01:00
Markolie 876a5067a0 Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes 2014-11-17 08:32:39 +01:00
Fox-McCloud 111b24ceb8 Janitor Rework 2014-11-10 03:17:56 -05:00
Markolie 7405ae30ee Camera console network rework 2014-11-08 23:12:38 +01:00
Fox-McCloud e0059bbf46 Implant Fix 2014-10-25 22:47:09 -04:00
Fox-McCloud 097cc95bd2 R&D Nerfs 2014-10-25 20:54:25 -04:00
iamgoofball 4330a339cd beep book goonfabs 4 i fucking hate git etc etc. 2014-08-14 12:27:15 -07:00
W3bster b66e875830 Map changes. Compile fix. 
-Fixed the compile error.
-Magistrate's office, linked with IAA's office.
-Clown's office.
-Mime's office.
-Central Command ERT quarters.
-Central DS Spawn Area.
-White gloves for the fancy NT rep.
-Fancy pen for the Fancy NT rep.
-Added cameras in surgery and recovery wards
-Fixed maintenance area missing
-Central Command can no longer be blown open
-Fixed Robotics maintenance pipes, cables, waste pipes missing.
-Added chair and swiper in NT rep.
-Added chair and swiper in blueshield.
-Added swiper in the bridge.
-Added chair and additional security at NT rec.
-More water tanks in maintenance for firefighting
-Light in the PDA server room near the AI.
-Fixed security's mulebot flaps
 2014-08-11 01:51:34 -04:00
IcyV f7e6f57a63 Allows for the antimov core to be created in research. 
Requires high and illegal research to reach, allows antimov modules to be created.
 2014-08-10 19:44:18 -07: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
ZuhayrandZomgPonies 13797e99ed New machines, adjusted Cael's seeds, rewrote space vines. 
Conflicts:
	code/defines/obj/hydro.dm
	code/game/machinery/hydroponics.dm
	code/modules/hydroponics/grown_inedible.dm
	code/modules/hydroponics/hydroitemdefines.dm
 2014-07-25 10:06:19 -04:00
ZomgPonies 64554340f4 Modifed faction system to use a list instead. Mobs can belong to multiple factions at once. 2014-07-19 13:26:55 -04:00
Walter0oandZomgPonies dbc621e7ab another missing battery check 2014-07-18 06:53:11 -04:00
Walter0oandZomgPonies 8e9b1b1b95 missing power check 
people could still use this without any charge
 2014-07-18 06:52:55 -04:00
ChinskyandZomgPonies ab8b3d25c4 Possible fix for #5645 
I think issue is that harvester won't forget what artifact it is using until harvesting process is started.
 2014-07-18 06:52:40 -04:00
ChinskyandZomgPonies dbeb254062 Fixes #5650 
Fixes #5649
Removed that mundane objects check as I couldn't think of why would that even be a thing.
 2014-07-18 06:52:28 -04:00
ChinskyandZomgPonies 5b1257ddb9 Fixes #5648 
Now scanner will just give warning if clicked too fast, instead of giving obsolete data.
Also moved code from New() to initalize(), since it depends on all things already being there and a master controller existing.

Conflicts:
	code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
 2014-07-18 06:51:59 -04:00
ChinskyandZomgPonies 95970f8cad Fixes #5647 Fixes #5646 2014-07-18 06:50:57 -04:00
Mark AherneandZomgPonies 9b45dbabfb Continued work in progress on a major revision of the NanoUI templating system. 
Conflicts:
	code/ATMOSPHERICS/components/omni_devices/filter.dm
	code/ATMOSPHERICS/components/omni_devices/mixer.dm
	code/game/dna/dna_modifier.dm
	code/game/machinery/cryo.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/modules/nano/nanoexternal.dm
	code/modules/nano/nanomanager.dm
	code/modules/nano/nanoui.dm
	code/modules/power/apc.dm
	code/modules/power/smes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
	nano/js/nano_update.js
	nano/templates/escape_pod_console.tmpl
 2014-07-15 07:22:15 -04:00
ZuhayrandZomgPonies 9c0a28b9d3 Fixes #5410 and possibly #5399 2014-07-12 22:02:35 -04:00
mwerezakandZomgPonies c11e6ae106 Adds suit cooling device 
Also:

Breathing in hot/cold air will affect your body temperature.
Fixes old body temperature stabilization code not working.
Thermometer icon now adjusts based on species.
Reduced BODYTEMP_AUTORECOVERY_MINIMUM to a less ridiculous value.

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/clothing/spacesuits/ninja.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/living/carbon/human/life.dm
 2014-06-21 17:23:30 -04:00
Cael AislinnandZomgPonies 5e02cedf46 switched autocloner and replicator artifacts over to a timer system, made replicator use materials to create items (materials can be anything) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-20 08:48:31 -04:00
Cael AislinnandZomgPonies c23cb7afef rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	code/modules/research/xenoarchaeology/finds/finds_defines.dm
 2014-06-20 08:47:51 -04:00
Cael AislinnandZomgPonies dbce0f457f harvester can now harvest artifact's secondary effect, which effect it chooses is determined by which are active (if both are active it can harvest neither) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-20 08:17:01 -04:00
Cael AislinnandZomgPonies 18d5053e5b miscellaneous fixes to various anomaly utiliser effects involving location/holder issues, fixed anomaly harvester runtime, reworks anomaly utiliser to be a lot easier/nicer to use, balance tweaks: 
- caps stun effect values for pulsing
- sets max utiliser battery charge to 300 (30 sec)
- changes energy consumption for utiliser pulse effects to "effect max charge level" * "effect range" ^ 2
- changes energy consumption for utiliser touch effects to 100 (10 sec worth of consumption)

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-20 08:16:40 -04:00
Cael AislinnandZomgPonies 2082789543 moved xenoarchaeology master controller code into a separate file 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	code/modules/research/xenoarchaeology/misc.dm
 2014-06-20 08:16:30 -04:00
Cael AislinnandZomgPonies 5439b04241 reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	code/global.dm
	code/modules/mining/mine_turfs.dm
	code/modules/research/xenoarchaeology/misc.dm
 2014-06-20 08:13:42 -04:00
ESwordTheCatandZomgPonies d17486b635 Revert it to this. 2014-06-19 10:34:26 -04:00
ESwordTheCatandZomgPonies d81d1736fc Remove spawn. 2014-06-19 10:34:14 -04:00
ESwordTheCatandZomgPonies bb54ac1ac4 Fix artifact spreading and large scanner. Remove extra list used the master_controller var again. 
Conflicts:
	code/modules/mining/mine_turfs.dm
	code/modules/research/xenoarchaeology/misc.dm
	code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
 2014-06-19 10:33:50 -04:00
mwerezakandZomgPonies 6ada0cf263 Adds sharp and edge flags to appropriate items 
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.

Conflicts:
	code/modules/research/xenoarchaeology/finds/finds_misc.dm
 2014-06-17 07:08:25 -04:00
ZomgPonies 2097bed55d 3rd mining overhaul commit, fun KEPT. 2014-06-15 07:52:52 -04:00
ZomgPonies 8d8d213e3e Merge pull request #253 from GhostAA12/master 
Fixes the Rapid Parts Exchange device
 2014-06-14 16:00:45 -04:00
GhostAA12 81c000f0cf Fixes the Rapid Parts Exchange device 
Previously did nothing because of missing proc on machinery
 2014-06-14 11:41:18 -07:00
ZuhayrandZomgPonies e4b95aa05e Moved engineering, research and mining shuttles to a generalized system with its own directory structure. 
Conflicts:
	baystation12.dme
	code/modules/mining/mine_items.dm
	code/modules/research/research_shuttle.dm
 2014-06-14 02:01:14 -04:00
AlexanderSeto 57e8d921ff Recommits storage 2014-06-12 16:28:19 -07:00
GinjaNinja32andZomgPonies 0fc144ed35 Fix xenoarcheology field generator 2014-06-08 18:30:37 -04:00
ZomgPonies 4cfeada9d7 Added baggies for drugs, aww yeah 2014-06-06 04:16:39 -04:00