18 Commits
Author SHA1 Message Date
KashargulandGitHub 1def015bad end of file Fix (#17308)
* end of file Fix

* fix those lints too
2025-03-10 16:15:35 -04:00
Guti 409aaba802 Remove 2024-09-09 02:36:53 +02:00
DrathekandGitHub 7c8bb85de3 Whitespace Standardization [MDB IGNORE] (#15748)
* Update settings

* Whitespace changes

* Comment out merger hooks in gitattributes

Corrupt maps would have to be resolved in repo before hooks could be updated

* Revert "Whitespace changes"

This reverts commit afbdd1d844.

* Whitespace again minus example

* Gitignore example changelog

* Restore changelog merge setting

* Keep older dmi hook attribute until hooks can be updated

* update vscode settings too

* Renormalize remaining

* Revert "Gitignore example changelog"

This reverts commit de22ad375d.

* Attempt to normalize example.yml (and another file I guess)

* Try again
2024-02-20 11:28:51 +01:00
Anewbe 8f42127837 Ports the supermatter grenade, supporting code 2018-08-11 20:10:05 -05:00
Anewbe 19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00
Anewbe dacbca746c Fixes low-yield EMP grenades 2016-10-08 19:38:49 -05:00
SinTwo 7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
Mark9013100 71075c600e Renames the classic EMP grenade 2016-05-28 17:12:43 -04:00
woodratt a22195aed3 1.3.0 of Grenades and Elevators
- Explosive grenades have gotten a major upgrade, (borrowed code from fragmentation grenades).
- Box for explosive grenades lowered to 5 grenades per box instead of 7.
- Evidence locker moved to forensics area from detective's office. Body bags, latex gloves, and evidence bags moved to said locker.
- Low yield EMP grenades created including sprites. Box for them created (neither added to the map).
- Can now spawn from the elevator.
2015-12-11 23:05:15 -08:00
PsiOmegaDelta 9b4d09c974 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm
2015-07-11 10:58:49 +02:00
mwerezak fb1eeae640 Adds inhand sprites for grenades
Adds inhand sprites for generic grenades, flashbang, and emp grenade.

Conflicts:
	code/game/objects/items/weapons/grenades/emgrenade.dm
2015-07-10 11:00:29 -04: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
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
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
Amunak 4882074739 Code formatting, EOL at EOF fixes, refactoring 2014-12-18 03:11:49 +01:00
johnsonmt88@gmail.com 3f1fc2ef62 Reduced EMP grenade range.
- Traitor grenades: 10 heavy range and 20 light range is now 4 heavy range and 10 light range

- Chem grenades: Chemists can no longer make EMP grenades as powerful as traitor grenades unless they use two large beakers. They used to be able to make EMP grenades as powerful as traitor grenades, or twice as powerful with two large beakers. Now they make slightly weaker versions unless two large beakers are used.

- Updated the list of uplink items to show that EMP grenade boxes hold 7 grenades since someone forgot to change it.

- EMP grenade boxes cost 4 crystals instead of 3.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5222 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-29 02:20:09 +00:00
giacomand@gmail.com 760a57c44d -Increased the range of the EMP grenade to 10/20.
-Added two more grenades inside the EMP kit.

-Made reagents, which react to turf, require a certain number of volume before affecting the turf. For instance, you need 5 units of Thermite on a wall now.

-Added an EMP pulse recipe. It will react immediately on the mixing of the required reagents, which are Uranium and Iron. A grenade with 50 units of Uranium and Iron will act the same as an ordinary EMP grenade, with 10/20 range. Less or more reagents will change the range.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4588 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-30 13:52:26 +00:00
johnsonmt88@gmail.com d36387607f More file structure stuff.
- The folders themselves are now finished
- Next I'll go through each file and organize them
- Lastly I'll start pulling the object definitions out of /code/defines/ and put them into their respective files.

**Note to committers**
Make sure the .dme file updates when you update to this revision. If necessary delete the .dme and svn-update.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4546 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 01:20:02 +00:00