cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 11:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,245 Commits 26 Branches 2 Tags
02aab3f779c25c71d87cfbb68b0dfd10eee90c20
Commit Graph

192 Commits

Author SHA1 Message Date
ESwordTheCat
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
Rob Nelson
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
Rob Nelson
9550b5877a Hopefully fix gibtonite explosions being fucked. 2014-02-28 19:30:22 -05:00
Rob Nelson
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
ZomgPonies
347bce3c06 Gibtonite fixes 2014-02-28 19:16:34 -05:00
Rob Nelson
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
Rob Nelson
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
Segrain
0568a0d3f2 Fix for unlocking exploit. 2014-02-14 12:07:56 +01:00
Rob Nelson
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
Rob Nelson
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
ZomgPonies
cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
SkyMarshal
0be7c1c9a2 Fix for mining. 
Fixes #4249
 2014-01-09 20:57:47 -05:00
SkyMarshal
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
ZomgPonies
3007803d07 Nerfed abandoned crates to be less fucking moronic 2014-01-01 16:18:56 -05:00
alex-gh
f6a4f16291 Abandoned crats spawn in unsimulated turfs 2013-12-11 03:34:27 +01:00
Iamgoofball
54f06a1d12 made head PDA carts be in lockboxes. Added Abandoned Crates! 2013-12-11 01:05:26 +01:00
ZomgPonies
e93400e22e Fixes potential infinite loops with creating mine turfs 2013-12-06 19:52:11 -05:00
ZomgPonies
3a37e74048 Moar turf optimizations! FIXED EDITION 2013-11-23 12:17:07 -05:00
ZomgPonies
fc29095086 Revert "More turf optimizations!" 
This reverts commit 70a9bdd3c5.
 2013-11-23 12:01:51 -05:00
ZomgPonies
70a9bdd3c5 More turf optimizations! 2013-11-23 06:21:38 -05:00
ZomgPonies
e837130d9e Tuning 2013-11-22 13:02:03 -05:00
ZomgPonies
383b0c6f64 Clown Planet bugfixes 2013-11-21 06:44:37 -05:00
ZomgPonies
52907cdb23 Fixed and working clown planet 2013-11-21 03:03:04 -05:00
ZomgPonies
859ed8bf38 Clown Planet V2 2013-11-20 21:47:00 -05:00
ZomgPonies
63677febbe More scoreboarding, more slot machining 2013-11-17 05:43:13 -05:00
alex-gh
9bdf8f06b7 Non-sheet items no longer get stuck at the sheet stacker 2013-11-13 18:47:55 +01:00
ZomgPonies
60994c591d /tg/ Wire Datum method pass 1: APC, Airlocks, Vending Machines\ 2013-11-10 13:14:22 -05:00
ZomgPonies
05955bb230 Added plasma windows 2013-11-02 04:03:07 -04:00
ZomgPonies
a227fa6cbe Removed zombies, added Skellingtons for halloween. Some bug fixes 2013-10-31 03:21:34 -04:00
ZomgPonies
d31e276cf8 Final XenoArch Fixes (maybe) 2013-10-30 03:33:07 -04:00
ZomgPonies
28d8f6f738 Re-education campt for naughty players. Glory to Cyberiad! 2013-10-30 03:13:47 -04:00
ZomgPonies
2df877bf82 Xenoarch update 2013-10-29 11:56:04 -04:00
Zuhayr
0f0ac218b3 Commented out blob and wish granter. 2013-08-03 12:51:41 -07:00
Peter Wall
0bd10c628d Fixed ore processing machines not updating properly 2013-08-01 14:42:53 +02:00
Peter Wall
e716e66d10 Made mechas able to bump-mine 2013-07-25 15:40:03 +02:00
Ispil
4c1bb073ff Fixes issue #2872, partially. Carp are now smashed by shuttles if they don't get pushed out of the way. However, they can still end up in grille-windows, giving more motivation to replace them in shuttles with actual shuttle windows. Also gibs other simple_animal creatures that are in the way. 2013-07-04 04:55:24 -07:00
Cael Aislinn
6ccaae583f excavation gear belts can now hold pick sets, pick sets can no longer hold hand picks (they spawn in the locker instead), picks and measuring tapes now work much faster 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-06-23 10:25:16 +10:00
Cael_Aislinn
6d03802c75 reduced the chance of safely extracting xenoarch finds without the proper process 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-14 13:08:30 +10:00
Cael_Aislinn
14bbdc91ca cleaned up artifact/find debris spawning, stopped debris being dropped for every asteroid turf, dropped machinery heat gain by 3/4 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-31 01:29:19 +10:00
Cael_Aislinn
398bdafbbd runtime fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-18 12:01:43 +10:00
Cael_Aislinn
1322ac469c removed rock spawn for ordinary miners 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 23:49:50 +10:00
Cael_Aislinn
040cf2f8d5 tweaked artifact extraction, artifacts 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-19 02:27:46 +10:00
Cael_Aislinn
f0de14d0d4 fixed xenoarch chemical analysis, added icons for excavation picks, various misc tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-14 21:59:50 +10:00
Cael_Aislinn
7fba00ce55 miscellaneous fixes + tweaks + cleanups (spoons, artifacts, geotracking, helpers for finds, tools / gear) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-14 13:28:31 +10:00
Cael_Aislinn
bbfbfb0ca2 tweaks to artifact spawning, tweaks and fixes to multiple anomalous artifact effects 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-13 12:23:20 +10:00
Cael_Aislinn
b63bc43820 new sprites, reworked digspite spawning and geosamples to fit artifacts, misc tweaks (admin logging on syndie beacon, energy field) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-12 22:55:07 +10:00
Cael_Aislinn
b2e9c265c4 new icons, added some large artifacts, renamed/restructured a bunch of files 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-10 01:30:40 +10:00
Cael_Aislinn
5533ef4946 setup digsite creation + propogation on mining asteroid, setup most excavation and tool interaction with mining turfs + digsites, setup tweaked list operation, modified dme 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-08 23:54:45 +10:00
Cael_Aislinn
651fa7a9f0 restructured tools, restructured/added archaeo finds, restructured how finds spawn in the asteroid, tweaked some mining stuff 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-04 23:40:53 +10:00
Cael_Aislinn
3f62e2a938 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/research/xenoarchaeology/artifact_effect.dm
	code/modules/research/xenoarchaeology/finds.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-02 17:05:27 +10:00