cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,952 Commits 8 Branches 0 Tags
1f6ec81e4039e35e298b642624a23e5fda8efcd0
Commit Graph

187 Commits

Author SHA1 Message Date
SkyMarshal
efcad9f527 Removal of Telescience. 2014-04-16 20:23:56 -07:00
Chinsky
06fd99b9ba Merge pull request #4723 from Jarcolr/diction 
Fixes some typos and descriptions
 2014-04-09 21:48:19 +04:00
Jarcolr
868dea5681 Grammar patch 1 
This is just the first one of many.
 2014-04-08 14:48:31 +03:00
Ccomp5950
98fba3b6b0 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/mining/machine_processing.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/virus2/helpers.dm
 2014-03-18 19:44:19 -05:00
RKF45
ddb414d740 Removal of plasma glass 2014-03-17 20:37:10 +01:00
Mloc
83d028e394 Merge pull request #4588 from Ccomp5950/ore_process_optimize 
Code effeciency project:  Ore processing.
 2014-03-17 19:14:20 +00:00
Ccomp5950
7ce4073135 Code effeciency project: Ore processing. 
Before:  The stacker and processor used del(item) to get rid of the items causing /obj/movable/del() to spike up and cause fun amounts of lag.  Also we have seperate variables for if a certain ore type is selected in the processing machine and the cooking portion of process() uses a huge string of if()'s which check 8 or so variables and is terrible and probably a pain in the ass should someone decide to later add ore types and recipes.

After:  We just set item.loc = null when it goes in the stacker of processor and garbage collection takes care of it within a tick.  Those different variables for ore selection are now just one variable which is a bitfield, much easier to read, much easier to expand upon.
 2014-03-15 04:05:56 -05:00
Jarcolr
53d0fac4e3 Small tweak to coin flipping. 
Last one,I swear.
 2014-03-14 18:39:22 +02:00
Jarcolr
c8c7ea34e9 Forgot var/sides = 2 
Oops.
 2014-03-13 19:33:54 +02:00
Jarcolr
51177f2663 You can now flip coins,AKA the D2 2014-03-13 18:56:01 +02:00
Loganbacca
1f7a444ab1 Fixed plasma glass outputting slag 
Fixes #4560

Code was missing continue statements.
 2014-03-12 13:15:23 +13:00
Loganbacca
8e1b286a84 Mining drill text 
- Adds drill_verb variables to pickaxe subtypes, so drills will now be described as "drilling" instead of "picking"
 2014-02-28 12:15:41 +13:00
Segrain
cba6dac062 Fix for unlocking exploit. 2014-02-09 13:34:40 +03:00
Loganbacca
909928f3f9 Plasma glass stacking fix 2014-01-11 18:14:51 +13:00
SkyMarshal
8885ad630e Fix for mining. 
Fixes #4249
 2014-01-09 17:26:13 -07:00
SkyMarshal
2308e71157 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed. 2014-01-08 21:33:17 -07:00
Zuhayr
37d96ebc80 Nerfs abandoned crates to be less fucking moronic. 2014-01-02 00:42:11 +10:30
Zuhayr
f638f1db96 Prevented the ability to open locked crates with random items. 2014-01-01 21:33:23 +10:30
Zuhayr
bda1297472 Merge branch 'master' of https://github.com/Zuhayr/Baystation12 2013-12-22 23:13:22 +10:30
Zuhayr
5b1bc6f8da Tentative fix for #4037, unable to reproduce runtime to check. 2013-12-19 22:13:48 +10:30
Iamgoofball
7dcb47ec2a R.I.P H.O.N.KBlaster 9000. You died as you lived. Hidden in a crate. 2013-11-20 15:19:24 -08:00
Iamgoofball
7fa80e799a made head PDA carts be in lockboxes. Added Abandoned Crates! 2013-11-20 14:57:22 -08:00
Iamgoofball
74b5a003cc Fixed Copypasta! 
Fixed Copypasta!
 2013-11-02 11:17:17 -07:00
Iamgoofball
a75492d26b Startoad's plasma windows commit, I'm doing the github stuff for it. 
3677121b51
 2013-11-01 18:53:45 -07:00
Cael Aislinn
4988c6f7e5 resolves issues with artifact location 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-10-30 15:36:56 +10:00
Cael Aislinn
c419717255 tweaks and reworks much of xenoarch including new content and streamlining/cutting down on old content, removes much unused and old content, slight remap of research outpost (see changelog for more details) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-10-29 05:33:23 +10:00
Kilakk
b5095646e2 Mining shuttle console now tells you if the shuttle is moving or not 2013-09-22 15:48:39 -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
Cael_Aislinn
632cad1044 observers can become mice, strange ore can be picked up in ore boxes/satchels, crates and closets can be built out of plasteel, changelog update 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 18:47:03 +10:00
Cael_Aislinn
bdeb96b7e5 Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/__HELPERS/game.dm
	code/controllers/shuttle_controller.dm
	code/datums/datumvars.dm
	code/datums/supplypacks.dm
	code/defines/obj/storage.dm
	code/defines/obj/vending.dm
	code/defines/obj/weapon.dm
	code/defines/procs/command_alert.dm
	code/game/area/Space Station 13 areas.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/dust.dm
	code/game/gamemodes/events/miniblob.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/factions.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/jobs/access.dm
	code/game/jobs/job/assistant.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/engineering.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/alarm.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/message.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/constructable_frame.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/recharger.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/mecha/mech_fabricator.dm
	code/game/mecha/working/ripley.dm
	code/game/objects/items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/medical.dm
	code/game/objects/items/weapons/cards_ids.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/hydroponics.dm
	code/game/objects/items/weapons/manuals.dm
	code/game/objects/items/weapons/secstorage/secstorage.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/storage/firstaid.dm
	code/game/objects/items/weapons/storage/kit.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
	code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/electricchair.dm
	code/game/objects/structures/extinguisher.dm
	code/game/objects/structures/watercloset.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/game/vehicles/airtight/airtight.dm
	code/game/vehicles/vehicle.dm
	code/global.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/critters/critter_defenses.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/power/cable.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/revolver.dm
	code/modules/projectiles/projectile/change.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/recycling/sortingmachinery.dm
	code/modules/research/designs.dm
	config/config.txt
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	icons/obj/grenade.dmi
	icons/obj/projectiles.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-11 22:12:31 +10:00
petethegoat@gmail.com
11b17c4442 Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746 
Standardization of the object tree and some modified functionality.
Moved a lot of storage/*_kit and similar boxes to storage/box/* ; most of these can now be found in boxes.dm. First aid kits remain a separate item type.
Replacement Light boxes pick up lights (for example broken ones) when used on them
Moved weapon/secstorage to storage/secure
Moved plant bags, ore satchel, trash bag, and sheet snatcher to storage/bag, in bags.dm
Fixed reagent_containers and snacks to pass through attackby() so the use_to_pickup code works. This affects plant bags, trash bags, and pill bottles.
Dice packs are now pill bottles, and all pill bottles can pick up dice.
Added error handling to uplink/generate_menu() so that one mistyped string doesn't bork the whole syndie uplink menu, since strings cannot be type-checked at compile time.
Cigarette packs and crayon boxes are now storage/fancy, however they retain existing update_icon() code.
Added a comment to storage.dm so that future people know where to look for use_to_pickup and allow_quick_gather code.

Updated all maps.

I've tried to test this thoroughly but I wouldn't be surprised if there were a few lingering issues. Try not to panic if you encounter any.

Full (i think) list of changed paths:
/obj/item/weapon/storage/flashbang_kit	> /obj/item/weapon/storage/box/flashbangs
/obj/item/weapon/storage/body_bag_box	> /obj/item/weapon/storage/box/bodybags
/obj/item/weapon/storage/chemimp_kit	> /obj/item/weapon/storage/box/chemimp
/obj/item/weapon/storage/trackimp_kit	> /obj/item/weapon/storage/box/trackimp
/obj/item/weapon/storage/seccart_kit	> /obj/item/weapon/storage/box/seccarts
/obj/item/weapon/storage/handcuff_kit	> /obj/item/weapon/storage/box/handcuffs
/obj/item/weapon/cigpacket		> /obj/item/weapon/storage/fancy/cigarettes
/obj/item/weapon/storage/mousetraps	> /obj/item/weapon/storage/box/mousetraps
/obj/item/weapon/storage/PDAbox		> /obj/item/weapon/storage/box/PDAs
/obj/item/weapon/storage/id_kit		> /obj/item/weapon/storage/box/ids
/obj/item/weapon/storage/lightbox/mixed	> /obj/item/weapon/storage/box/lights/mixed
/obj/item/weapon/storage/donkpocket_kit	> /obj/item/weapon/storage/box/donkpockets
/obj/item/weapon/storage/beakerbox	> /obj/item/weapon/storage/box/beakers
/obj/item/weapon/storage/syringes	> /obj/item/weapon/storage/box/syringes
/obj/item/weapon/storage/gl_kit		> /obj/item/weapon/storage/box/rxglasses
/obj/item/weapon/storage/diskbox	> /obj/item/weapon/storage/box/disks
/obj/item/weapon/storage/stma_kit	> /obj/item/weapon/storage/box/masks
/obj/item/weapon/storage/lglo_kit	> /obj/item/weapon/storage/box/gloves
/obj/item/weapon/storage/lightbox/bulbs	> /obj/item/weapon/storage/box/lights/bulbs
/obj/item/weapon/plantbag		> /obj/item/weapon/storage/bag/plants
/obj/item/weapon/storage/satchel	> /obj/item/weapon/storage/bag/ore
/obj/item/weapon/trashbag		> /obj/item/weapon/storage/bag/trash

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5494 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-08 19:11:56 +00:00
Cael_Aislinn
6aa245f716 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	code/game/gamemodes/gameticker.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-08 23:08:52 +10:00
Cael_Aislinn
2ad36df02a fixed up a bunch of miscellaneous derps that broke compiling (several unticked files, as well as one mistakenly removed file) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-08 23:03:48 +10:00