Commit Graph

297 Commits

Author SHA1 Message Date
NanakoAC
64df4907df Mousetrap, mouse and spawning fixes (#1497)
Adjusts mousetraps a bit. So they'll be triggered by all mobs instead of only humans, and trigger when walked on. Also nerfs the instastun that comes from stepping on them without shoes, because that's pretty broken against giant monsters like vaurca breeders. applies halloss instead based on mob size. Smaller things get hurt more.

Fixes #1445 
Fixes #1449 
Fixes #1450
2017-01-11 22:40:30 +02:00
printer16
657ca8acb3 Bug fixes (#1214, #1219, #1174, #1185, #1202, #1170) (#1274)
Fixes #1214 
Fixes #1219 
Fixes #1174 
Fixes #1185 
Fixes #1202 
Fixes #1170
2016-12-24 04:14:00 +02:00
Alberyk
7fe4433669 Syndicate borg rework and general fixes (#1275)
Changes:
-added some vars that allow for more pre-set borg models, ported from the newest bay changes
-added combat module and an ert borg as admin spawn presets
-fixed syndicate cyborg
-syndicate cyborgs explode when killed now
-added a limited frag grenade launcher to the syndicate module
-fixed a lot of broken guns
-fixed the bad ert id code added by the ert update
-fixed the tactical shield to have sprites and behave properly
-tweaked even more the vending machine at sec armory
-disabled joining as actor
-enabled spess bikes, heisters get two of them and can get one via cargo contraband system
-replaced advanced advanced e-guns with energy rifles
-fixed some missing id sprites
-fix #1281
2016-12-23 20:16:23 +02:00
NanakoAC
879f3faef8 Istype (#20)
Fixes a couple of is errors with missing functions.
Added isDrone as macro

restored the various is non macro functions. i don't know how or if they could be macro-ized
2016-11-22 20:25:28 +02:00
skull132
e9b688e1f6 Merge branch 'development-2' into development
Christ on a stick. SO MANY ERRORS. REEE.

# Conflicts:
#	baystation12.dme
#	code/_helpers/lists.dm
#	code/_helpers/logging.dm
#	code/_helpers/text.dm
#	code/_onclick/click.dm
#	code/controllers/configuration.dm
#	code/controllers/master_controller.dm
#	code/datums/supplypacks.dm
#	code/game/antagonist/antagonist.dm
#	code/game/antagonist/antagonist_print.dm
#	code/game/antagonist/outsider/commando.dm
#	code/game/antagonist/outsider/ninja.dm
#	code/game/area/areas.dm
#	code/game/gamemodes/cult/cult_items.dm
#	code/game/gamemodes/game_mode.dm
#	code/game/jobs/access.dm
#	code/game/machinery/atmoalter/canister.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/mecha/mech_fabricator.dm
#	code/game/mecha/mecha.dm
#	code/game/objects/effects/spiders.dm
#	code/game/objects/items.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/flash.dm
#	code/game/objects/items/devices/lightreplacer.dm
#	code/game/objects/items/devices/paicard.dm
#	code/game/objects/items/devices/scanners.dm
#	code/game/objects/items/devices/suit_cooling.dm
#	code/game/objects/items/devices/uplink.dm
#	code/game/objects/items/robot/robot_upgrades.dm
#	code/game/objects/items/toys.dm
#	code/game/objects/items/weapons/cards_ids.dm
#	code/game/objects/items/weapons/handcuffs.dm
#	code/game/objects/items/weapons/manuals.dm
#	code/game/objects/items/weapons/material/kitchen.dm
#	code/game/objects/items/weapons/material/misc.dm
#	code/game/objects/items/weapons/material/swords.dm
#	code/game/objects/items/weapons/melee/energy.dm
#	code/game/objects/items/weapons/melee/misc.dm
#	code/game/objects/items/weapons/scrolls.dm
#	code/game/objects/items/weapons/storage/belt.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/tools.dm
#	code/game/objects/objs.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/janicart.dm
#	code/game/sound.dm
#	code/game/turfs/simulated.dm
#	code/game/verbs/ooc.dm
#	code/global.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/verbs/modifyvariables.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/head/hardhat.dm
#	code/modules/clothing/head/helmet.dm
#	code/modules/clothing/head/jobs.dm
#	code/modules/clothing/head/misc_special.dm
#	code/modules/clothing/shoes/jobs.dm
#	code/modules/clothing/spacesuits/alien.dm
#	code/modules/clothing/spacesuits/captain.dm
#	code/modules/clothing/spacesuits/miscellaneous.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces.dm
#	code/modules/clothing/spacesuits/rig/suits/alien.dm
#	code/modules/clothing/spacesuits/spacesuits.dm
#	code/modules/clothing/spacesuits/void/merc.dm
#	code/modules/clothing/spacesuits/void/void.dm
#	code/modules/clothing/suits/armor.dm
#	code/modules/clothing/suits/jobs.dm
#	code/modules/clothing/suits/storage.dm
#	code/modules/clothing/suits/utility.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/clothing/under/jobs/security.dm
#	code/modules/economy/Events.dm
#	code/modules/economy/Events_Mundane.dm
#	code/modules/economy/economy_misc.dm
#	code/modules/events/blob.dm
#	code/modules/events/event.dm
#	code/modules/events/event_container.dm
#	code/modules/events/event_manager.dm
#	code/modules/events/money_lotto.dm
#	code/modules/events/prison_break.dm
#	code/modules/events/spacevine.dm
#	code/modules/hydroponics/trays/tray.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/emote.dm
#	code/modules/mob/holder.dm
#	code/modules/mob/language/station.dm
#	code/modules/mob/living/bot/cleanbot.dm
#	code/modules/mob/living/carbon/alien/diona/diona.dm
#	code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
#	code/modules/mob/living/carbon/give.dm
#	code/modules/mob/living/carbon/human/emote.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/outsider/vox.dm
#	code/modules/mob/living/carbon/human/species/station/golem.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/carbon/metroid/metroid.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defense.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/admin.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/drone/drone.dm
#	code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
#	code/modules/mob/living/silicon/robot/emote.dm
#	code/modules/mob/living/silicon/robot/robot_items.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
#	code/modules/mob/living/silicon/silicon.dm
#	code/modules/mob/living/simple_animal/bees.dm
#	code/modules/mob/living/simple_animal/friendly/cat.dm
#	code/modules/mob/living/simple_animal/friendly/corgi.dm
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	code/modules/mob/living/simple_animal/friendly/mouse.dm
#	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/logout.dm
#	code/modules/mob/mob.dm
#	code/modules/mob/mob_grab_specials.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_alien.dm
#	code/modules/organs/organ_external.dm
#	code/modules/paperwork/faxmachine.dm
#	code/modules/projectiles/ammunition/boxes.dm
#	code/modules/projectiles/ammunition/bullets.dm
#	code/modules/projectiles/guns/energy/nuclear.dm
#	code/modules/projectiles/guns/energy/rifle.dm
#	code/modules/projectiles/guns/energy/special.dm
#	code/modules/projectiles/guns/projectile.dm
#	code/modules/projectiles/guns/projectile/automatic.dm
#	code/modules/projectiles/guns/projectile/pistol.dm
#	code/modules/projectiles/guns/projectile/revolver.dm
#	code/modules/projectiles/guns/projectile/shotgun.dm
#	code/modules/projectiles/projectile/bullets.dm
#	code/modules/projectiles/projectile/special.dm
#	code/modules/reagents/reagent_containers.dm
#	code/modules/reagents/reagent_containers/food/drinks.dm
#	code/modules/research/designs.dm
#	code/modules/research/destructive_analyzer.dm
#	code/modules/research/rdconsole.dm
#	code/modules/spells/artifacts.dm
#	code/modules/spells/spellbook.dm
#	code/modules/tables/tables.dm
#	code/world.dm
#	config/example/config.txt
#	icons/mob/items_lefthand.dmi
#	icons/mob/items_righthand.dmi
#	icons/obj/lighting.dmi
2016-10-31 00:01:52 +02:00
skull132
87e041aa75 Merge remote-tracking branch 'bay12-upstream/master' into development 2016-10-07 00:58:39 +03:00
SoundScopes
18ec817b67 Fixes #368 (#908)
Ghosts can write in blood again.
2016-09-11 13:23:58 +03:00
NanakoAC
d6803a26e3 Respawning Tweaks (#646)
changes:

rscadd: "Respawn timers are now tracked individually for playing as animals (mice), small synthetics (drones and pAIs) and crew (everything else). This means you can now play as a mouse or drone while waiting to respawn as a full crewmember.".
tweak: "You can now spawn as a drone immediately upon joining as an observer, without having to wait ten minutes. There is still a cooldown between respawning as a drone if you just died as one."
tweak: "Slightly improved the error messages if you try to respawn when you've not waited long enough."
In addition, unlisted changes:
The admin verb 'Allow player to respawn' now sets all three respawn timers
Respawn times are now centralised in setup #defines, for easier editing in future
Nonliving mobs will no longer attempt to ghost when deleted. A comment in mob.dm explains this change
2016-08-03 22:34:41 +03:00
NanakoAC
1344a49758 Mouse Spawning Fixes (#513)
Mice will no longer spawn in closed systems with nowhere to ventcrawl to.
Mice can no longer spawn in breached areas and die immediately. A spawnpoint with a safe environment will always be chosen.
2016-07-05 23:32:04 +03:00
skull132
61744e18e8 Aghost requires R_MOD or R_ADMIN 2016-04-02 22:30:45 +03:00
skull132
fda5a7781f Remove R_MENTOR & R_HOST
Flags unnecessary, procs and functions concerning them removed.
2016-02-05 23:20:39 +02:00
PsiOmegaDelta
6089ccccea Makes events global.
Greatly decreases the number of objects that need to be created (currently 3 event handlers in total vs basically 3 per datum)
The price is a slower lookup of listeners but on a per round basis it should still be much less than the current startup time penalty.
2016-01-26 13:12:37 +01:00
PsiOmegaDelta
8468c4951e Fixes observers leaving null entries in the moved listener list when returning to their bodies. 2016-01-20 11:12:08 +01:00
PsiOmegaDelta
1210a6e42f Adds the moved event.
Allows movable atoms to follow other movable atoms, as quickly as BYOND allows. Also supports following atoms inside other atoms.
However, this only works fully when Move() or forceMove() is utilized. Setting loc directly will not raise the moved event.
2016-01-18 20:16:48 +01:00
PsiOmegaDelta
c30a518221 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
2015-12-02 09:18:07 +01:00
PsiOmegaDelta
50fb4a8de7 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
Conflicts:
	code/game/objects/items/devices/multitool.dm
2015-11-23 08:57:12 +01:00
Zuhayr
e5ec6c761b Adds a possession system for ghost mousedrop(). Currently allows for control of mice, drones and use of drone fabricators. 2015-11-23 05:52:33 +10:30
Chinsky
f9e56ddb18 Merge pull request #11349 from PsiOmegaDelta/151023-Wires
Converts the nuclear bomb to the new wire system.
2015-11-19 10:11:13 +03:00
PsiOmegaDelta
8a4250ddcd Can now connect cryo pods and computers with each other using the new multitool methodology.
Also cleans up Destroys().
2015-11-17 22:58:10 +01:00
PsiOmegaDelta
9e321ff6d5 Updates the nuclear bomb code and makes it utilize NanoUI, ported from Paradise. 2015-11-15 13:08:42 +01:00
PsiOmegaDelta
be542f23b0 Compilation fixes. 2015-11-10 10:56:44 +01:00
PsiOmegaDelta
527254dcc8 Merge remote-tracking branch 'upstream/dev' into 151108-CleanMiceDeath 2015-11-10 10:54:10 +01:00
PsiOmegaDelta
eb37292120 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-11-10 10:37:22 +01:00
PsiOmegaDelta
2968952913 Merge pull request #11438 from Baystation12/master
Dev-freeze
2015-11-10 10:34:40 +01:00
PsiOmegaDelta
6f559779b5 Additional respawn refactoring.
Removes a non-utilized config setting.
Adds a config setting to set the respawn timer, defaults to 30 minutes as today.
Makes the MayRespawn() proc utilize this config setting. Makes more uses of MayRespawn() check the respawn delay.
2015-11-08 20:05:37 +01:00
PsiOmegaDelta
4ab55646a6 Cleaner mouse death.
Mouse that go splat now call death() instead of doing partial death handling.
When one wishes to join as mouse timeofdeath is checked, instead of a snowflake var.
2015-11-08 13:03:02 +01:00
PsiOmegaDelta
5c587e69b6 Exploit fix.
Players can no longer immediately respawn as mice by ghosting.
2015-11-07 17:12:50 +01:00
PsiOmegaDelta
3fd28dd361 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
2015-10-14 08:41:38 +02:00
PsiOmegaDelta
3fd172ee63 Merge pull request #11294 from Baystation12/master
Dev-freeze
2015-10-14 08:40:03 +02:00
PsiOmegaDelta
7247906f41 ghostize() now attempts to set the most relevant time of death.
ghostize() now only uses the mob's time of death if the mob is actually dead, otherwise uses the current time. Fixes #11229.
2015-10-12 12:55:34 +02:00
PsiOmegaDelta
55c9f7533b Alien eggs now include follow and spawn links. The alien larvae plant seed check now uses the specific type instead of a name. 2015-10-07 08:56:13 +02:00
PsiOmega
63de1764c3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-27 13:48:33 +02:00
PsiOmega
807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm
2015-09-27 13:36:56 +02:00
HarpyEagle
380b89fcc0 Fixes #11130, renames aghosted var
because it is no longer used solely for aghosting.
2015-09-26 20:48:13 -05:00
PsiOmegaDelta
232dd5bfb1 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
2015-09-18 08:51:10 +02:00
PsiOmegaDelta
9946c837e4 Merge pull request #11134 from Baystation12/master
Dev-freeze
2015-09-18 08:50:11 +02:00
PsiOmega
a938c7b648 Prevents observer mice from spawning on the admin Z-level. 2015-09-13 11:35:47 +02:00
PsiOmega
0d91ca0dfd Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
2015-09-13 10:52:01 +02:00
PsiOmega
830d2feb0d Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/game/objects/structures/crates_lockers/largecrate.dm
2015-09-13 10:44:06 +02:00
PsiOmega
8d57b2d0a0 Fixes observers being unable to see silicon antag status.
target_list contains mob/living mobs while the previous loop only looped over living/carbon/human.
To make things a bit of a headache hud_list is defined separately for living/carbon/human and living/silicon, instead of directly on /living.

It is certainly possible to define hud_list at mob/living instead but adding an extra loop for silicons is the method that is least likely to break things, thus the most appropriate for a master fix.
2015-09-12 14:39:10 +02:00
Zuhayr
fca95039bf Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	code/game/gamemodes/intercept_report.dm
	code/game/gamemodes/traitor/traitor.dm
	code/global.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/living.dm
	html/changelogs/.all_changelog.yml
2015-09-07 11:31:19 +09:30
Zuhayr
9d5f14298d Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/game/gamemodes/traitor/traitor.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-09-07 11:03:41 +09:30
Zuhayr
90c9d31782 Refactored the antagHUD to work better with the new antagonist system. 2015-09-05 18:51:17 +09:30
PsiOmega
93a8a3a13f Observers can now view radio settings, admins can alter them. 2015-09-04 10:07:41 +02:00
PsiOmega
579c5be239 Makes observers use forceMove.
This ensures things like OnEnter/Exit, light updates properly for all occasions when a ghost moves, not only for manual movement.
2015-08-23 17:45:46 +02:00
PsiOmegaDelta
120ce3f20c Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums
Conflicts:
	code/modules/admin/topic.dm
2015-08-20 14:16:35 +02:00
PsiOmegaDelta
74b8f6c3be Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
2015-08-17 09:44:21 +02:00
PsiOmegaDelta
55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/setup.dm
2015-08-17 09:37:49 +02:00
PsiOmega
1186ec2af6 The stat panel now displays station time along with current round duration. 2015-08-15 22:09:18 +02:00
PsiOmega
c81ad0964e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2015-08-15 11:06:03 +02:00