Commit Graph
4623 Commits
Author SHA1 Message Date
alex-gh cfbfa0e993 Smoke rework caused endless loops, reverted. 2014-04-08 01:47:56 +02:00
alex-gh 521ad31671 Revert the new lighting system. 2014-04-07 23:51:35 +02:00
Loganbaccaandalex-gh 0fba806c7b Chemsmoke rewrite
- Complete rewrite of the chemsmoke spawning code (everything that happens after the reaction to create the smoke).
- Moved it into it's own file since it's a little longer than the old one code-wise.
- Tweaked the smoke sprites; gave chemsmoke directions for more randomization, and tweaked the timing of their animations so they are smooth now.

Most of the code is documented, so you should be able to follow what's going on just reading through it. In short though:
- Chemsmoke now affects a circular area with a variable range depending on the total amount of chemsmoke created (no more 1-of-each-ingredient smoke grenades - sorry).
- The carried reagent volume in the cloud balances itself according to how big the affected area is (larger area, less carried reagent per turf).
- The carried reagent has more volume the closer you are to the centre of the cloud.
- The visual smoke effect scales with how big the affected area is.

Conflicts:
	code/game/objects/effects/effect_system.dm
	icons/effects/96x96.dmi
2014-04-03 18:21:26 +02:00
Chinskyandalex-gh 7f4388c5a3 Cleaned the fuck out of smoke.
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/objects/effects/effect_system.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/organs/organ_external.dm
2014-04-03 18:18:04 +02:00
ArynandZomgPonies 072bdcde60 I think I fixed everything it is possible to stuff a light source into.
Conflicts:
	code/game/dna/dna_modifier.dm
	code/game/machinery/Sleeper.dm
	code/game/objects/structures/transit_tubes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/recycling/disposal.dm
2014-03-21 09:58:54 -04:00
Ccomp5950andZomgPonies 1e5514e27e Code effeciency project: HUD items rewrite
Before: Every tick each HUD item would recalculate and redo images for every mob in view. For items like the secHUD where we're transversing implants and the various records this gets very expensive.

After: Mobs use their hud_list variable to store varius huditem images, when conditions change for those specific huditem images it updates the specific ones on demand. As a backup every 30 ticks or so the mob will update all of their hud_list.

Also: moved proc/RoundHealth() from 2 seperate locations into __HELPERS/mobs.dm

Conflicts:
	code/__HELPERS/mobs.dm
	code/game/objects/items/weapons/implants/implanter.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defines.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/virus2/helpers.dm
	code/setup.dm
	icons/mob/hud.dmi
2014-03-10 08:07:29 -04:00
Jeremy LibermanandZomgPonies 99a588631a Wearing masks or straight jackets blocks chewing on your wrists 2014-03-05 22:27:40 -05:00
Jeremy LibermanandZomgPonies 55ba32d02d Fractures and severed limbs cause cuffs to fall off. Deranged spessmen can chew their own wrists to break free.
Conflicts:
	code/game/objects/items/weapons/handcuffs.dm
2014-03-05 22:20:44 -05:00
alex-gh c0d4c2c8f7 re-added death alarm implanters 2014-03-02 09:17:49 +01:00
ZomgPonies 7a87ee111f Compile fixes 2014-02-28 19:09:24 -05:00
Rob NelsonandZomgPonies c7774b3a41 Fully fixed compressed-matter implanter. Tested. (GitHub #526)
Conflicts:
	code/game/objects/items/weapons/implants/implanter.dm
2014-02-28 19:06:39 -05:00
ZomgPonies 1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
LokiamisandZomgPonies 544c39f7c2 salvage
Conflicts:
	code/game/jobs/access.dm
	code/game/objects/items/weapons/cards_ids.dm
	maps/tgstation.2.1.0.0.1.dmm
2014-02-16 10:38:52 -05:00
Rob NelsonandZomgPonies 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 NelsonandZomgPonies 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
ZomgPonies 7a54bb3b24 Merge pull request #159 from alex-gh/fireex_nerf
Nerfed firing items from fire extinguishers, they now do double the dama...
2014-02-15 12:39:41 -05:00
alex-gh 9aaf0b8a5c fixed unfinished merge 2014-02-14 14:22:39 +01:00
alex-gh 4776dfd94f Telebaton now only stuns if it actually hits. 2014-02-14 14:13:03 +01:00
Zuhayrandalex-gh 85b59532fe using a welder with already damaged eyes no longer causes you to go blind
Conflicts:
	code/game/objects/items/weapons/tools.dm
2014-02-14 13:48:46 +01:00
alex-gh 0f57ef70ca Nerfed firing items from fire extinguishers, they now do double the damage compared to throwing them normally 2014-02-14 13:22:34 +01:00
RKF45andZomgPonies c69ddf76ec Reintroducing the dough-based cooking system.
Conflicts:
	code/modules/food/recipes_microwave.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
2014-02-01 19:22:22 -05:00
ZomgPonies 05149946d6 Remove borken RPD 2014-02-01 04:30:17 -05:00
RazharasandZomgPonies 5c8d9ede3b Added chem handling and IED recipe
Uh oh

Conflicts:
	code/game/atoms.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/structures/tables_racks.dm
2014-01-31 02:56:27 -05:00
ZomgPonies 6dfa08040c Merge pull request #131 from SamCroswell/master
More C4 suicide phrases. For no Raisin.
2014-01-28 20:15:26 -08:00
ZuhayrandZomgPonies 8c5ad54e0f Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR.
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/admin/verbs/vox_raiders.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/mob/living/carbon/species.dm
2014-01-28 15:30:20 -05:00
SamCroswell beea722e60 More C4 suicide phrases. For no Raisin. 2014-01-26 14:45:16 -05:00
ZomgPonies f084d49d24 Compile fixes 2014-01-25 12:40:47 -05:00
Rob NelsonandZomgPonies 22f6bb90be Add additional extinguisher logging, transfer logging framework.
Conflicts:
	code/game/objects/items/weapons/extinguisher.dm
2014-01-25 12:29:21 -05:00
Jesus Hussein ChrisandZomgPonies 95f7280781 Generic attack sounds for all melee weapons
Overrides the generic sounds with more suitable ones where needed.
Weapons that do no damage don't have sound effects.

Conflicts:
	code/game/gamemodes/wizard/artefact.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/game/objects/weapons.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
2014-01-22 10:15:43 -05:00
Rob NelsonandZomgPonies 7892eeb7cc Standardize LASER, NOCLONE, and HUSK
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	code/modules/mob/living/carbon/human/death.dm
	maps/RandomZLevels/wildwest.dm
2014-01-21 22:59:53 -05:00
Rob NelsonandZomgPonies d49e6d3bf4 Standardize CLUMSY
Conflicts:
	code/game/jobs/job/civilian.dm
	code/game/objects/items/weapons/defib.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/reagents/reagent_containers/syringes.dm
2014-01-21 22:49:22 -05:00
Rob NelsonandZomgPonies 22a2df1115 Standardize HULK.
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/items/weapons/swords_axes_etc.dm
2014-01-21 22:45:40 -05:00
ZomgPonies cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
Rob NelsonandZomgPonies a04324baef Fix more by-ref issues in DNA
Conflicts:
	code/game/machinery/hydroponics.dm
2014-01-20 01:54:33 -05:00
Rob NelsonandZomgPonies c349f761d9 Fixes for DNA2, again, 2014-01-20 01:50:56 -05:00
Rob NelsonandZomgPonies 20bc568131 Fix DNA injectors breaking shit.
Conflicts:
	code/game/dna/dna2_helpers.dm
2014-01-20 01:49:49 -05:00
Rob NelsonandZomgPonies 6fe47cfc51 Standardize buffers on all DNA machines in an attempt to fix DNA modifiers. WILL BREAK SHIT
Conflicts:
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/weapons/dna_injector.dm
2014-01-20 01:48:57 -05:00
Rob NelsonandZomgPonies fd6cc3e458 HA HA NEW GENE HANDLING
Also fixed block injector crash.

Conflicts:
	code/game/dna.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	html/changelog.html
2014-01-20 01:41:03 -05:00
Rob NelsonandZomgPonies dc60cc1726 DNA modifiers work now.
Conflicts:
	code/defines/obj/hydro.dm
	code/game/machinery/cloning.dm
	code/game/machinery/hydroponics.dm
	code/modules/mob/living/carbon/zombie/zombie.dm
	code/modules/mob/transform_procs.dm
2014-01-20 00:54:46 -05:00
Rob NelsonandZomgPonies 4a8ca0a7d4 Now tested up to character join. 2014-01-20 00:44:10 -05:00
Rob NelsonandZomgPonies db21525feb SAY HELO TO DNA2, N3X15'S AWFUL FUCKING RECODE OF DNA
Conflicts:
	baystation12.dme
	code/game/gamemodes/setupgame.dm
	code/game/objects/items/weapons/dna_injector.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/new_player/new_player.dm
2014-01-20 00:43:19 -05:00
Pete GoodfellowandZomgPonies 331cf1df95 Updated all suicide_act()s to use a new span class, 'suicide'.
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/modules/hydroponics/growninedible.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
	code/stylesheet.dm
2014-01-19 21:25:47 -05:00
ZomgPonies 90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
GlloydandZomgPonies 085de1b71c Resolves #2213 Fixes the back icons for the scythe and the Roman shield.
Conflicts:
	icons/mob/back.dmi
2014-01-19 05:32:34 -05:00
AranclanosandZomgPonies eb76256f04 Adds the captain's medal to the medal's lockbox.
Fixes issue 2358

Conflicts:
	code/game/objects/items/weapons/storage/lockbox.dm
2014-01-16 21:55:00 -05:00
ZomgPonies b80552169c Stupid type 2014-01-15 13:13:13 -05:00
Mark Aherne (Faerdan)andZomgPonies c1c49fe6d8 Canister, Tank & Tank Transfer Value NanoUIs.
* Added Canister, Tank & Tank Transfer Value NanoUIs.

Conflicts:
	code/game/machinery/atmoalter/canister.dm
	nano/css/shared.css
2014-01-15 01:53:51 -05:00
Rob NelsonandZomgPonies 55e918cc6a Wire hacking recode from /tg/.
Conflicts:
	baystation12.dme
	code/__HELPERS/mobs.dm
	code/defines/obj/weapon.dm
	code/game/machinery/alarm.dm
	code/game/machinery/doors/airlock.dm
	code/game/machinery/machinery.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/paicard.dm
	code/game/objects/items/weapons/explosives.dm
	code/global.dm
	code/modules/assembly/signaler.dm
	code/modules/mob/living/silicon/mommi/life.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/wires.dm
2014-01-12 22:37:55 -05:00
Rob NelsonandZomgPonies 9fdde1eec7 Fix #388: Incorrect C4 timing checks.
Conflicts:
	code/game/objects/items/weapons/explosives.dm
2014-01-10 01:59:07 -05:00
Rob NelsonandZomgPonies da6b615e44 Adjacent didn't work, back to using get_dist. 2014-01-10 01:56:45 -05:00