cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-01 13:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,916 Commits 8 Branches 0 Tags
0914aad76576b6a6be5626455be13f73b0449b51
Commit Graph

66 Commits

Author SHA1 Message Date
Cadyn
cf1db3c049 Memory tracking shenanigans (#8359) 2024-05-15 16:56:31 +02:00
CHOMPStation2
234aed941f [MIRROR] fix some runtimes and an overlay overflow (#8210) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-04-11 07:47:45 +02:00
Guti
172e1c7c12 Balloon Alerts (#7877) 2024-03-15 07:40:14 +01:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
Chompstation Bot
84d54d6c4e [MIRROR] Chemsprayer Update 2021-07-25 00:27:57 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Mechoid
496322f4f1 Reagent Hoses 2020-08-20 21:24:06 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
45b4947d1e Merge pull request #6584 from TheFurryFeline/TFF-Print_Da_Sprayers 
Printable Spray Bottles
 2019-12-25 18:10:16 -05:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Neerti
acb208dd3f Works on New Blob 2017-11-29 22:35:01 -05:00
Neerti
828dacf485 Centralizes weight class definitions 
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
 2016-09-22 00:51:51 -04:00
mwerezak
108a748d1f Fixes pepperspray making sounds even when the safety is on 2016-07-11 04:54:40 +01:00
Zuhayr
565e39a28f Porting forensics from Aurora. 2015-12-10 19:16:28 +10:30
Kelenius
bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
 2015-08-21 16:15:07 +03:00
Kelenius
7c1d9b5614 Mech chargers are now a single machine 
Can be built and upgraded
Resolves #5215
 2015-08-16 06:07:36 -07:00
PsiOmega
3a08e2884a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm
 2015-08-15 10:52:17 +02:00
mwerezak
133bc96344 Fixes #10645 
Sets unacidable where appropriate.
 2015-08-14 23:20:10 -04:00
mwerezak
32b95445e3 Gives changeNextMove() a better name, default define 2015-06-30 22:29:45 -04:00
mwerezak
087a978d56 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown 
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-06-28 22:35:14 -04:00
PsiOmegaDelta
1558bd5b75 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/toys.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers.dm
	html/changelogs/.all_changelog.yml
 2015-06-19 10:19:08 +02:00
mwerezak
8007d42783 Adjusts usages of reagent transfer procs 
Adds splash() proc for futureproofing.
Replaces instances of splash_mob() with splash()
Replaces instances of trans_to() with splash() where appropriate.
 2015-06-10 00:03:08 -04:00
Kelenius
0071ed3f24 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/machinery/deployable.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/setup.dm
 2015-06-07 14:05:54 +03:00
Kelenius
6d54e1c655 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/mob_grab.dm
 2015-05-21 17:00:50 +03:00
Kelenius
35a20002c6 Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	baystation12.dme
	code/defines/obj/weapon.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
	code/game/mecha/mecha_parts.dm
	code/game/objects/items/devices/flash.dm
	code/game/objects/items/devices/powersink.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
	code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
	code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
	code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
	code/game/objects/items/weapons/circuitboards/machinery/power.dm
	code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
	code/game/objects/items/weapons/circuitboards/machinery/research.dm
	code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
	code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
	code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
	code/game/objects/items/weapons/flamethrower.dm
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/items/weapons/kitchen.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/teleportation.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/assembly/igniter.dm
	code/modules/assembly/infrared.dm
	code/modules/assembly/mousetrap.dm
	code/modules/assembly/proximity.dm
	code/modules/assembly/signaler.dm
	code/modules/assembly/timer.dm
	code/modules/assembly/voice.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/mining/drilling/scanner.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/ore.dm
	code/modules/mob/living/silicon/robot/analyzer.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
	code/modules/research/research.dm
	code/modules/research/server.dm
	code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
 2015-05-20 11:50:28 +03:00
Kelenius
3fa79f8d51 Removes click cooldowns almost everywhere. 
Still have: doors, windoors, cameras, windows, grilles, blobs, resisting, alien stuff, mechas, spray bottles.
Setting changeNextMove is now responsibility of the item being attacked.
Adds a config option to eliminate click cooldowns completely. Intended to be used by devs.
 2015-05-09 17:27:19 +03:00
Kelenius
317abc6b79 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/datums/recipe.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/mop.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/organs/organ_internal.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/exodus-1.dmm
 2015-04-28 10:49:26 +03:00
Kelenius
d9e2947b32 Updates chemistry colors 2015-04-28 09:23:39 +03:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
PsiOmega
990530d118 Ports /vg/'s spell system for the sake of cult porting. 
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
 2015-04-09 20:08:06 +02:00
Kelenius
db30c15e4c Updates to science 
Protolathe and CI build procs moved to them from RD console.
Protolathe and CI now have a build queue. Designs take varying time to
build.
P and CI material storage is now a list instead of a set of vars.
origin_tech is now a list.
All sheets now contain exactly 2000 units of matter.
In design datum, chemicals and materials are two separate lists.
Designs are now sorted. The method is kinda hacky but flexible. They
have a var, sort_string. Designs are sorted alphabetically using it.
Circuits how show whether they build a machine or a computer in CI menu.
Adds item construction, for now protolathe is used.
 2015-04-04 13:38:03 +03:00
Kelenius
b4b635f32d Chemistry commit 
I messed something in the git
 2015-03-25 19:09:10 +03:00
Zuhayr
8b9cf94e2e Readded icon for water flower. 2015-02-16 22:18:12 +10:30
Zuhayr
8fb5836e4f Generalized fruit products properly. 2015-02-13 03:52:46 +10:30
Zuhayr
78e61d9ccd Tweaks to xenoflora, added plant icons and colours to all plants. 2015-02-04 10:42:39 +10:30
PsiOmega
6fabf503e1 Merge remote-tracking branch 'upstream/master' into dev 2015-02-01 17:39:19 +01:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
Kelenius
5f496524d2 Changes how sprays work and re-adds silicate 
Sprays will spray directly at solid objects if they are clicked (walls,
windows, etc).
Makes removal of wall rot with plant-b-gone actually work.
Re-adds silicate with the old recipe. It repairs windows and makes them
more damage-resistant up to half damage taken.
 2015-01-17 19:11:41 +03:00
Zuhayr
591fc164de Updating rack paths to match previous commit. 2014-12-24 12:26:43 +10:30
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
Zuhayr
7682711442 Fixes #6474 2014-09-25 18:45:27 +09:30