525bb1a96f
Stun Changes
2014-12-30 12:30:14 -05:00
84b9f05149
Xeno Tweaking
2014-12-16 20:26:27 -05:00
a1959291b7
Coin Flipping! Also more map fixes.
2014-12-04 17:12:41 -05:00
72196cd272
Merge pull request #119 from ZomgPonies/master
...
sync
2014-11-24 02:45:57 +01:00
211023bd67
Syndicate Medibots, Energy Recharge Fix
...
- Adds the ability to construct Syndicate Medbots, which were previously
in the code but unable to be constructed. These bots will only heal
Syndicate Nukeops, and can only be made from the medikit box that
Nukeops can purchase.
- Fixed recharging in energy crossbows and laser tag guns, they were
recharging 10x slower than they were meant to.
2014-11-08 19:16:33 -05:00
01cc6409e7
supermatter drill
...
New traitor item
2014-11-06 19:28:34 +01:00
e5e9013ab4
make bananium smeltable
...
exactly as the title says, though, the smelter menu calls it 'clown',
because the oretag is clown, didn't fix it, because i dont know what
things use the oretag variable(i know some), and didn't want to break
anything over such a small bug
2014-09-24 15:15:56 +02:00
24b78b69be
Use absolute paths next time
2014-08-16 18:11:49 -04:00
4330a339cd
beep book goonfabs 4 i fucking hate git etc etc.
2014-08-14 12:27:15 -07:00
ce7d05ccf3
Fix errors from ticker initializing after map ore
...
Ores only count towards the station's score if it spawns on Z=5 (Mining
Asteroid Level). The old method caused errors in the server log because
gameticker/ticker initialized after the map ore spawns.
This also means that ore mined on the Clown Planet don't count.
2014-08-04 16:24:00 -04:00
109754ac2b
Track Ore Mined for Scoreboard
...
Increments the score for ore mined each time ore is mined (i.e.:
spawned) after the game starts.
2014-08-04 12:00:44 -04:00
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
ed1e3f8bc4
Fixed plasma ore
2014-07-25 11:36:08 -04:00
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
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
6b08fa875a
Fixes #5608
...
Conflicts:
code/modules/mining/machine_processing.dm
2014-07-14 03:25:02 -04:00
1079661a1e
Reapplied scanners to map, stopped braces working on drill turfs with no resources.
...
Conflicts:
maps/tgstation2.dmm
2014-07-13 08:45:03 -04:00
333c3c8ae7
Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.
...
Conflicts:
baystation12.dme
code/modules/admin/admin_verbs.dm
maps/tgstation2.dmm
2014-07-13 08:44:47 -04:00
6e9f55f262
Fixes #5472
2014-07-13 06:34:37 -04:00
7fe1c6cb0e
Update distribution.dm
2014-06-25 06:16:02 -04:00
7f96a7d6bc
Mining tweaks, removal of debug/cruft, balancing of values.
2014-06-25 06:15:49 -04:00
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
8b77070cbe
Added new minerals and sprites to mining
2014-06-19 15:24:03 -04:00
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
4f20de625c
Fixes #5255 and walking over edges
...
Before walking over an asteroid edge would have put the mob under the
sprite, as if the mob crawled under it.
2014-06-19 10:14:35 -04:00
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
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
2097bed55d
3rd mining overhaul commit, fun KEPT.
2014-06-15 07:52:52 -04:00
d31a39256e
2nd mining overhaul commit. Fun KEPT.
2014-06-15 07:45:27 -04:00
521e5e49ef
Ironed out some bugs. Everything should be working for testing purposes.
2014-06-15 07:36:21 -04:00
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
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
106fe78649
mining: fix for mining cooling down
...
Hacky thing that was already done to space. TCMB->T0C
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-31 10:39:20 -04:00
418ba281d7
Fixes circuit var for other consoles
...
Also cleans up attackby while we're at it.
Conflicts:
code/game/dna/dna_modifier.dm
code/game/machinery/computer/arcade.dm
code/game/supplyshuttle.dm
code/modules/mining/mine_items.dm
code/modules/reagents/Chemistry-Machinery.dm
code/modules/research/research_shuttle.dm
code/modules/research/server.dm
2014-05-26 06:21:03 -04:00
18e3e37507
adds new feature: cloning extinct animals and seeds from fossils found through xenoarchaeology, some minor tweaks to various other areas to make it work
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
Conflicts:
icons/obj/hydroponics.dmi
icons/obj/xenoarchaeology.dmi
2014-05-03 17:25:57 -04:00
5746c7b6d4
Balancing for mining
2014-05-01 00:13:46 -04:00
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
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
9550b5877a
Hopefully fix gibtonite explosions being fucked.
2014-02-28 19:30:22 -05:00
24185de680
Move mining surprise shit around, start working on layout rules.
...
Conflicts:
baystation12.dme
code/game/mining_surprise.dm
compare_report.txt
2014-02-28 19:29:24 -05:00
347bce3c06
Gibtonite fixes
2014-02-28 19:16:34 -05:00
71c07e208a
Improved creature AI and random mob spawning in caves.
...
Also equipment lockers.
Conflicts:
code/game/objects/items/weapons/cards_ids.dm
code/modules/mining/materials.dm
code/modules/mining/mine_turfs.dm
code/modules/mining/ores_coins.dm
code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
code/modules/projectiles/ammunition/bullets.dm
code/modules/projectiles/guns/energy/special.dm
compare_report_tg.txt
icons/obj/device.dmi
icons/obj/mining.dmi
icons/obj/vehicles.dmi
maps/tgstation.2.1.0.0.1.dmm
maps/vgstation1.0.0.dmm
2014-02-16 04:40:18 -05:00
6ad3ca77f1
New stuff for mining
...
Conflicts:
code/game/mining_surprise.dm
code/game/objects/structures/wizmobile.dm
code/modules/mining/mine_turfs.dm
code/modules/mining/minerals.dm
compare_report_tg.txt
icons/obj/mining.dmi
icons/turf/walls.dmi
2014-02-16 03:54:39 -05:00
0568a0d3f2
Fix for unlocking exploit.
2014-02-14 12:07:56 +01:00
c3b021e246
Added a garbage collector implementation based on rumors from Goon and proc references in released gooncode.
...
And holy shit it's fast
Conflicts:
baystation12.dme
code/ATMOSPHERICS/pipes.dm
code/game/machinery/Sleeper.dm
code/game/machinery/rechargestation.dm
code/game/objects/structures/crates_lockers/crates.dm
code/game/objects/structures/tables_racks.dm
code/modules/mining/mine_turfs.dm
code/modules/paperwork/photocopier.dm
code/modules/power/cable.dm
html/changelog.html
2014-01-29 23:45:21 -05:00
1f30243a08
Refactor the fuck out of theft objectives. No more stealing your own jumpsuit.
...
Conflicts:
code/datums/mind.dm
code/game/gamemodes/objective.dm
code/modules/mining/money_bag.dm
code/modules/mining/ores_coins.dm
html/changelog.html
2014-01-24 12:16:57 -05:00
cb5367ed96
Switching cable coils to stacks
2014-01-21 21:23:26 -05:00
0be7c1c9a2
Fix for mining.
...
Fixes #4249
2014-01-09 20:57:47 -05:00
e2bbbb7e39
Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.
...
Conflicts:
code/modules/mining/mine_turfs.dm
2014-01-09 20:56:38 -05:00
3007803d07
Nerfed abandoned crates to be less fucking moronic
2014-01-01 16:18:56 -05:00
Fox-McCloud