Commit Graph

1720 Commits

Author SHA1 Message Date
phil235
2ad8d4a392 * Fixes the holosign_creator's sign counter not going back up when one of its holosign is destroyed.
* Fixes the lack of second argument in alien/stun()
* Fixes the sleeping alert not being updated properly when a mob asleep is killed then revived.
* Fixes timestop effect leaving mobs unable to move forever in some cases.
* Fixes teleporter hub and station staying active when the hub's panel is open, despite the hub's open panel sprite looking offline. The Hub and station now use their own iconfile icons/obj/machines/teleporter.dmi (similar what most machines have).

* I've moved all mob's status adjustment procs (Stun(), Paralyse(), blur_eyes() adjust_drugginess(), etc...) into specific files (named "status_procs.dm") so they're easier to find. I've added a third argument to stun adjustments procs to ignore the CANSTUN flag. I've also changed the weaken procs to have the ignore_canweaken argument be the third argument, so all status adjustment procs have amount as first arg, updating the mob or not as second, and when necessary an ignore_x as third arg.
2016-04-28 00:13:15 +02:00
Joan Lung
ffc87184f0 You can now analyze blobs to check material effects, blob type, and health
* You can now analyze blobs to check material effects, damage resistance, and health.

* beep beep

* slime extinguishes stuff

* I need to check my code

* wew

* buffnerfs

* fuckthemeta

* morebuffs

* no unfriendly fire

* damn my urge for low linecounts

* this makes me want to drink heavily

* if you see something, say nothing, and drink to forget

* waiting for an answer is for scrubs

* if you see something say nothing and drink to forget

* no resist printout

* phiiiiiiiil
2016-04-27 10:24:47 -05:00
phil235
6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
KorPhaeron
b8c6e93b29 Merge pull request #16732 from Iamgoofball/patch-22
Fluorosulfuric SACid
2016-04-26 05:13:09 -05:00
phil235
bb1f60e769 Fixes typos and errors I made.
Fixes unscrewing a broken computer only dropping one glass shard instead of two.
Fixes AI holopad, recharger, keycard authentication device, reagent_dispensers reagentgrinder, and APC  not being attackable.
Fixes APC cover knockdown being random, it now uses the take_damage() proc, which also allows animals and xenos to knock down the cover of a broken apc.
2016-04-25 22:29:17 +02:00
phil235
fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
phil235
b146131a34 Second commits.
This contains the changes to item_attack.dm
Obj/attackby() now follows a similar structure as mob/living/attackby. It calls attack_obj() (like attack() but for obj) which calls attacked_by (just like attack() does)
The use of the NOBLUDGEON flag changes a bit, it is now used to signify the item cannot be used as a melee weapon at all. No attack animation, no attack message. I've given this bitflag to many items that have an afterattack() so as to not both attack and do the special action (among those items: the rcd)

There's also the code changes to attacking machines: attacking any machine now give a proper message and a sound. And with this, I made more machines breakable (using a health var and the very little used BROKEN stat). Most notably, tables can now be attacked when on harm intent and be destroyed.

The newly destroyable machines have a take_damage() proc used by all sorts of attack (weapon, xeno, animal, hulk, mech melee, gun projectile, thrown items).

There's some more stuff in there, see the PR's description and comments.
2016-04-24 20:37:00 +02:00
phil235
0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
Iamgoofball
8883442266 Update toxin_reagents.dm 2016-04-23 15:05:29 -07:00
Akke
ef3b790229 typos 2016-04-23 20:55:44 +01:00
Akke
ba0463de25 fixes . = 1 2016-04-22 22:50:31 +01:00
Akke
dedf15c2c5 Reworks sensory.dm 2016-04-21 19:30:28 +01:00
Cheridan
d671bf573c Merge pull request #16858 from nullbear/Chemical-Explosives
Adds Chemical Explosives
2016-04-18 02:35:56 -05:00
Joan Lung
755fa61417 Merge pull request #16816 from lordpidey/lordpidey_methboom
Adds meth mixing related explosions
2016-04-14 09:39:58 -04:00
Jack Edge
52827cc7b9 Merge branch 'master' into without-the-crates 2016-04-14 08:50:14 +01:00
Cheridan
5a51d2e9f9 Merge pull request #16818 from phil235/FixSeedShit
Fixes Seed runtimes
2016-04-13 15:58:59 -05:00
nullbear
df32979866 Adds Chemical Explosives
see changelog for details
2016-04-13 13:09:41 -07:00
KorPhaeron
9988ee1975 Merge pull request #16696 from SamuelRowe/master
Minor grammar fixes
2016-04-13 00:22:39 -05:00
Joan Lung
b0d6771903 Merge pull request #16694 from Fox-McCloud/xenobio-tweaks
Xenobio Additions and Tweaks
2016-04-12 20:57:50 -04:00
phil235
d03a5c9343 Simplifies the build_recipe_text() proc used by tablecrafting to not create and delete an object just to get its name (replaced by the "initial()" trick).
Adds some if(seed) checks to growns code to prevent runtimes for seedless growns.
2016-04-12 03:51:45 +02:00
Mike Long
d923049357 Adds meth mixing related explosions 2016-04-11 19:04:37 -04:00
AndrewJacksonThe2nd
a075043f86 Arnold Palmer, Auto-collecting Slime Processors, and Cyborg Booping 2016-04-09 15:34:10 -07:00
Iamgoofball
57cf5927d6 Update toxin_reagents.dm 2016-04-08 23:54:23 -07:00
SamuelRowe
a33bb423f8 fixing 2016-04-09 14:50:58 +12:00
Fox-McCloud
e07a67e6a3 partial revert 2016-04-08 20:57:39 -04:00
GunHog
d67feceb07 Forgot to close the span 2016-04-08 18:26:58 -05:00
GunHog
8ed74088c1 Dropper change
- Droppers once again work on all mobs, but now do not work on aliens.
1000% more snowflake yet less anger inducing!
2016-04-08 18:25:23 -05:00
Fox-McCloud
8c8f13fc8a amount tweaks 2016-04-07 22:36:19 -04:00
Iamgoofball
2d9d65e550 Fluorosulfuric SACid
🆑 Iamgoofball & Super Aggro Crag
tweak: Fluorosulfuric Acid now has doubled acid power.
experimental: Fluorosulfuric Acid now does BONUS burn damage scaling on the time it's been inside the consumer.
/🆑
2016-04-07 19:20:42 -07:00
GunHog
6725a2e682 Membrane change, dropper nerf
- Droppers now only work on human mobs
- Resin membranes now block lasers.
2016-04-07 18:04:12 -05:00
SamuelRowe
33c55d2197 Fix 2016-04-07 16:57:27 +12:00
SamuelRowe
b4d0190a47 Minor grammar fixes
self-explanitory
2016-04-07 16:05:56 +12:00
Fox-McCloud
14d611ecc1 Xenobio Additions and Tweaks 2016-04-06 22:36:58 -04:00
duncathan
497a4efc70 makes atmos_spawn_air() use the new gas string parser 2016-04-04 01:49:09 -06:00
Cheridan
cf4ffc2781 Merge pull request #16026 from duncathan/turfs
[REVIEW-READY] removes simulated turfs (and asteroid station)
2016-04-04 01:49:45 -05:00
TechnoAlchemist
40daf9ec34 fixes the tricord recipe because I cannot into spelling. 2016-04-03 19:32:38 -07:00
KorPhaeron
2d41f26541 Merge pull request #16515 from TechnoAlchemisto/spoof_chem
Re-adds the recipes for Kelotane, Bicardine, Antitoxin, and Tricordazine.
2016-04-03 20:31:18 -05:00
duncathan
a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm
2016-04-03 18:22:20 -06:00
Supermichael777
bcedee0f42 OOPS 2016-04-02 23:49:27 -04:00
TechnoAlchemist
059666660f Fixes chem_reactions to proper names, 2016-03-31 15:05:10 -07:00
TechnoAlchemist
38e971feb8 Fixes spelling 2016-03-31 02:08:16 -07:00
TechnoAlchemist
7678e68c4e :^) 2016-03-30 22:16:42 -07:00
TechnoAlchemist
0862131ac5 :^) 2016-03-30 22:15:12 -07:00
TechnoAlchemist
c1bae85f6b :^) 2016-03-30 22:10:15 -07:00
duncathan
e86cf0f280 praise the good lord, for the game finally compiles 2016-03-29 19:04:37 -06:00
duncathan
3f1375ba39 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	_maps/RandomZLevels/Cabin.dmm
	_maps/RandomZLevels/beach2.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/templates/lavaland_surface_automated_trade_outpost.dmm
	_maps/templates/lavaland_surface_biodome_winter.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	code/controllers/subsystem/air.dm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/effects/aliens.dm
	code/game/objects/effects/overlays.dm
	code/game/objects/items/apc_frame.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/girders.dm
	code/game/turfs/simulated.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/mineral_floor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/simulated/river.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/simulated/walls_reinforced.dm
	code/modules/admin/verbs/buildmode.dm
	code/modules/atmospherics/environmental/LINDA_turf_tile.dm
	code/modules/events/spacevine.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/holodeck/turfs.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/interactive.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/bot/floorbot.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/singularity/narsie.dm
	code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
	code/modules/research/server.dm
2016-03-29 14:46:06 -06:00
duncathan
b9950c4358 turf/open and turf/closed 2016-03-29 13:38:56 -06:00
Remie Richards
17defb66d4 Bee fixes and updates!
* Added the ability to make Apiaries and Honey frames with wood
* Added the ability to make Royal Bee Jelly from 10 Mutagen and 40 Honey
* Added the ability to make more Queen Bees from Royal Bee Jelly by using it on an existing Queen, to split her into two Queens
* Made homeless bees more obvious
* Fixed a typo that made almost all bees homeless, severely reducing the odds of getting honeycomb
* Made bee progress reports (50% towards new honeycomb, etc.) always show, even if it's 0%
* Made some feedback text more obvious
* Fixed being able to duplicate the bee holder object, this was not exploity, just weird
* Fixed being able to put two (or more) queens in the same apiary
* Fixed some runtimes from hydro code assuming a plant gene exists
* Fixed runtime when you use a honeycomb in your hand
* It now takes and uses 5u of a reagent to give a bee that reagent
* Removed unused icon file
2016-03-27 21:07:53 +01:00
Cheridan
12d1562005 Merge pull request #16365 from Supermichael777/patchpatch
Adds delay to patches
2016-03-26 20:12:15 -05:00
Supermichael777
621b2ec948 fixes from local testing 2016-03-25 15:37:45 -04:00