cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,202 Commits 8 Branches 0 Tags
18bc6fb6e3fbcc455f13d8aa5d46318fe5586a8e
Commit Graph

74 Commits

Author SHA1 Message Date
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Darlantan
09768ea90c Confetti cannon 
-Adds confetti cannon
-Adds grenade object needed to make the cannon work
-Makes the cannon printable at RnD
 2020-09-05 07:15:49 -04:00
Darlantan
1b220d1cd4 Revert "Check-out commit" 
This reverts commit dc957fe40b.
 2020-09-02 03:16:25 -04:00
Darlantan
dc957fe40b Check-out commit 
Committing now so I can work on other things
 2020-09-02 03:10:18 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Atermonera
b2250d9b47 Improvements to mech missiles. 2020-08-25 19:16:57 -04:00
Novacat
cd357dafd4 Update crossbow.dm 2020-07-14 01:18:35 -04:00
Cerebulon
f1f2196077 Flavour Enhancement: Guns 2020-07-13 23:06:11 -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
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Spades
eb0e2ec1f5 Guns sounds refactor and improvements 2019-03-27 10:42:18 -04:00
Anewbe
c2794c571d Hopefully fixes some tool-conversion things 2018-08-03 15:13:29 -05:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
Arokha Sieyes
73838e0a62 POLARIS: Revamp logging to be consistent 2018-03-13 18:20:58 -04:00
Neerti
99eb6f9404 Updates Tools 
Adds toolspeed var, which is a multiplier on how 'fast' the tool works.  0.5 means it goes twice as fast.
Adds usesound var, which determines what sound is used when a tool is being used.
Changes a lot of code to use those two vars instead.
Adds 'ayyy' tools, which are ported from /tg/'s abductor gamemode.  They're currently admin only but I might make them obtainable by xenoarch later.
Adds powertools, also from /tg/.  CE starts with them in a new toolbelt that spawns in their locker, ported from (you guessed it) /tg/.
Changes welder sprites to look nicer, ported yet again from /tg/.  Modified the blue welder slightly so it can be the electric welder sprite.
Adds various sounds from /tg/, for tools and welders.
 2017-08-03 04:49:23 -04:00
Cameron653
e158fcd3cc Macro Replacements. (#3574) 
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
 2017-07-19 12:47:23 -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
Spades
ff87150c3d Let's just have the one commit this time because I'm no longer paranoid of losing progress. 2016-06-01 12:48:48 -04:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation. 
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
 2016-05-04 00:24:55 -04:00
Kelenius
df5a0d7941 Mob inventory cleanup 
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
 2016-03-24 01:23:08 +03:00
Zuhayr
a628ae2a56 Removed the Vox Pox. 2016-02-20 11:24:19 +10:30
Datraen
129965b1c4 Adds a variable to check for grenade loading, makes frags unloadable. 2016-02-16 12:58:17 -05:00
Kelenius
60196df634 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/modules/projectiles/gun.dm
 2015-08-13 08:40:31 +03:00
PsiOmega
e875a7ce48 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer3/buildandrepair.dm
	code/game/objects/items/devices/lightreplacer.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
 2015-08-08 15:34:51 +02:00
mwerezak
0ceb0e291d Fixes #10314 
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
 2015-08-02 00:01:10 -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
Zuhayr
48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
mwerezak
f8d5127078 Adds SLOT_EARS to various items 2015-06-21 01:45:43 -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
PsiOmega
fc6de24042 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/materials/material_sheets.dm
	code/modules/organs/organ_icon.dm
	code/setup.dm
 2015-06-07 10:51:41 +02:00
mwerezak
f62cc38883 Adds logging for syringe_gun 
Also updates holder get_reagents() output formatting
 2015-06-06 17:02:42 -04:00
Kelenius
3bdb5ff9ea Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/leather.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/kitchen.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
 2015-05-22 19:26:39 +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
Zuhayr
2714e458b3 Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev 2015-05-17 12:58:09 +09:30
PsiOmega
8b39f9201a Compilation fixes. 2015-05-16 22:41:13 +02:00
PsiOmega
83a09faf07 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/brain/MMI.dm
	code/modules/projectiles/guns/launcher/crossbow.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
 2015-05-16 22:38:01 +02:00
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr
8aa24b86bb Renamed shards, katanas, claymores. 2015-05-16 20:36:33 +09:30
mwerezak
d71a727131 remove_from_mob() considered harmful 2015-05-16 00:32:44 -04:00
mwerezak
5d620ff05b Span classes 2015-05-16 00:21:40 -04:00
mwerezak
3e41d6ff6e Fixes crossbow icon issue 
Fixes an issue with the crossbow icon that occurred when releasing the
tension soon after starting to draw it back.
 2015-05-15 23:06:29 -04:00
mwerezak
65819302f3 Fixes #8986, one less object verb 2015-05-15 23:06:02 -04:00
mwerezak
29609f7ec6 Fixes #8985, ammo magazine examine grammar. 2015-05-15 23:04:50 -04:00
Kelenius
10915eae24 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm
 2015-05-15 11:28:05 +03:00
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Zuhayr
bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
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