Commit Graph

1048 Commits

Author SHA1 Message Date
Kelenius
18358936ee Merge branch 'dev' into ofSleepersAndNano
Conflicts:
	maps/exodus-1.dmm
	maps/exodus-2.dmm
	maps/exodus-5.dmm
2015-08-14 16:50:44 +03:00
Chinsky
94f0ceffe1 Merge pull request #10200 from mwerezak/gun-desc
Renames of various firearms (squashed version)
2015-08-14 03:55:43 +03:00
mwerezak
b5425e0bd9 Makes beer and ale bottles into actual bottles, adjusts bottle smashing
Generalizes opening drink containers, makes beer and ale bottles a subtype of bottle instead of can
Adjusts bottle smashing, duration, damage, and reliability.
2015-08-13 18:37:13 -04:00
Kelenius
60196df634 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
Woodrat
df92e8d1d1 Woodrat Work 7.9 - Minty Fresh Edition
- EMP box sprite added and now used for the EMP box.
- Adjusted lights in Janitorial
- 5 Earmuffs added to Engineering. 3 to atmos, 2 in the engine monitoring room.
- Dock Port broken wire fixed and pipes removed.
- Misplaced CMD camera near the park deleted.
- Fixed EVA maint door access.
- Due to popular request, laser tag lockers now have 5 sets of equipment rather than two.
- Fixed some holodeck designs
- Slimes added to xenobio
- Random gas sensors in space near the research outpost fixed.
- CE door access fixed.
- Changed Northern Star issue tag to mint green.
- Mining z-level overhaul, mining engineering outpost given its own area. Standardized wire colors, overhauled engineering outpost on the mining z-level, added substations to each outpost.
- Empty jar added to the RD office
- Beepsky removed until I can figure out how he beeps.
- AI and status displays added to the pool.
- Random shovel now in science/cargo maintenance.
- Fire alarms and other equipment added to the coffee shop.
- Fire alarm, radio, fire extinguisher, light switches, shutters, and a button added to the IA office.
- Furniture changes to the metal chair and comfy chair.
2015-08-12 21:47:49 -07:00
Hubblenaut
3fb52ab4d5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
2015-08-11 00:51:18 +02:00
Mark9013100
65089c44b7 Adds a box for fingerprint cards 2015-08-09 11:36:57 -04:00
Neerti
f407f9aa22 Merge pull request #137 from Woodratt/Woodrat_Work_7.8
Woodrat Work 7.8 "Tiny mini skirt edition"
2015-08-09 02:29:38 -04:00
Woodrat
b8c0c5ca5d Woodrat Work 7.8 "Tiny mini skirt edition"
- Added jumpskirts to their department lockers.
- Fixed minor code issue with the QM skirt
- Single scientist wardrobe added to research rest room
- Removed robust cola machine from gateway, added laptop vendor in its stead.
- Two universal recorders added to the main map. Captain's office and art storage.
- Adjusted and added cameras to the doc area to improve coverage.
- Adjusted cameras in primary hallway leading to the dock for coverage purposes.
- Added newscaster to central park.
- Finalized work on the large dorms/visitor housing.
- Added CM sprite for frag grenades for our grenades, also lessened the size of the explosion to (-1,-1,3) from (-1, -1, 4) in a vain attempt to make the blast radius smaller. They shouldn't be too much weaker but...
- Sprite for a box of frag grenades added, box of 7 frag grenades also added to code.
- Two merc op TTVs removed, one left behind. One box of frags and 6 blocks of c4 added to merc op shuttle in their stead.
- One box of frag grenades added to ERT armory.
2015-08-08 23:18:39 -07:00
Mark9013100
1b014ef703 Minor ERT/Central changes 2015-08-08 14:21:00 -04:00
Mark9013100
b601310f9b Men in black 2015-08-08 06:01:35 -04:00
Woodrat
ff9ddf3bfe Woodrat Work v7.7
- Glass Sheets in robotics increased to two 50 sheet stacks.
- Removed accidentally added tile next to medical.
- Engineering Solar cameras now properly named and on proper networks.
- Dock Hallway cameras added, Bridge entrance cameras updated with proper network.
- Fixed broken access on Nanomed Plus vendors and medical closets.
- Single fire extinguisher added to patient ward hallway
- Work on the dock finalized, no other major changes to be done, glass firelocks installed.
- Cafeteria work finalized. Glass firelocks added, Kitchen now properly access locked.
- Air alarm added to security checkpoint.
- Two emergency flood lights added to engineering storage.
- Single camera added to EVA, may change out with two others.
- Redundant and unnetworked cameras removed.
- Hydroponics fore door switched to dual chef/gardener access.
- Guess pass terminal added to the bridge hallway.
- Bar layout finalized, glass firelocks added.
2015-08-07 21:49:23 -07:00
Mark9013100
6309d30a3a Fixes #83 2015-08-04 06:37:37 -04:00
Kelenius
f948932bee Updates sleepers
WIP
2015-07-29 11:17:15 +03:00
Dragor
697157a6bc Changes all gun names to generic descriptive names, moves names into desc. Updates the descriptions of various guns to be more loreful. 2015-07-15 22:08:21 -04:00
PsiOmegaDelta
34fdc4712e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm
2015-07-14 08:21:12 +02:00
PsiOmegaDelta
8da7141af1 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-07-14 08:11:11 +02:00
mwerezak
0fc12eb22b Fixes #9927
Fixes issues with deca code crates.
2015-07-13 00:45:36 -04:00
mwerezak
32b95445e3 Gives changeNextMove() a better name, default define 2015-06-30 22:29:45 -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
mwerezak
c7ff5eebe3 Updates hats to use item_state_slots where necessary. 2015-06-27 23:33:33 -04:00
GinjaNinja32
82aa88c777 Merge pull request #9862 from Zuhayr/dev
Fixes
2015-06-20 17:27:26 +01:00
Zuhayr
6f00d831e5 Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct
Base proc: emag_act
2015-06-21 01:18:25 +09:30
Zuhayr
9f9a5cc49e Fixes #9843 2015-06-20 21:37:41 +09:30
Hubblenaut
5a026b1553 Overhauls berets, adds corporate black 2015-06-18 18:10:35 +02:00
PsiOmegaDelta
06a1ece4b8 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
PsiOmegaDelta
cc7c502fb8 Updates emag attackby usages to emag_act where it's not too much of a headache. 2015-06-16 09:34:13 +02:00
unknown
c062f886c0 Attempting to weld closet with inactive welder no longer produces message claiming insufficient fuel. 2015-06-10 22:07:52 -05:00
Chinsky
94406a6430 Merge pull request #9694 from PsiOmegaDelta/150605-Meteors
Ports /tg/'s meteors.
2015-06-08 14:17:57 +03: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
GinjaNinja32
16faba0f7c Merge pull request #9692 from Baystation12/dev-freeze
Dev freeze
2015-06-05 20:32:30 +01:00
PsiOmegaDelta
a07d20d657 Ports /tg/'s meteor implementation.
Merges the two meteor events into one, and now takes severity into consideration instead.
Including the basic meteors there are also new types ranging from flaming to radioactive which may drop appropriate types of ore.
2015-06-05 14:58:35 +02:00
PsiOmegaDelta
979b6adcae Removes some qdel:s of lists.
Primarily done by removing the need for clearing the contents list of bio-lockers in the first place.
2015-06-05 12:05:43 +02:00
GinjaNinja32
63ea8338fb Merge remote-tracking branch 'upstream/dev' into span_class=notice
Conflicts:
	code/ZAS/Diagnostic.dm
	code/game/machinery/computer3/laptop.dm
	code/game/machinery/requests_console.dm
	code/game/objects/items/stacks/tiles/plasteel.dm
2015-06-05 00:49:13 +01:00
PsiOmegaDelta
88b80732e7 Generalizes access definitions.
Access description, type, and area/region (medical, security, etc.) is now defined in a datum, ensuring the id modification consoles will (should) never be missing entries.
2015-06-02 18:11:46 +02:00
GinjaNinja32
94e19592cf objects/effects, objects/structures 2015-05-30 14:37:40 +01:00
PsiOmega
62185bc0a8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-26 08:35:32 +02:00
Chinsky
d4eb0e82bb Merge pull request #9293 from RavingManiac/dev
Emote, say() and visible_message() refactor, tape recorder upgrade
2015-05-25 20:53:04 +03:00
GinjaNinja32
3fb3a18f05 Supply shuttle and crate fixes
- Supply point generation no longer increases over time, leading to a total of around 45000 points generating after 150 minutes
- Supply packs can have access set as either a number or a list; either is transferred to crates' req_access var correctly
- Non-secure reagent cartridge crates no longer use secure crates
- Closet/crate examine now calls ..() in all circumstances, not just when the user is more than one tile away
- Possibly more I can't remember
2015-05-23 16:15:04 +01:00
RavingManiac
04293467e8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-05-22 00:04:37 +10: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
PsiOmegaDelta
66b8d67637 Merge pull request #9390 from mwerezak/attack-animation
Attack animations
2015-05-21 06:52:30 +02:00
mwerezak
87178d74a6 Adds attack animation calls for attack_generic() 2015-05-20 00:19:39 -04:00
Zuhayr
93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
PsiOmegaDelta
ce8188c1a2 Merge pull request #9350 from Hubblenaut/lockers
Fixes overbloated closets
2015-05-18 19:16:59 +02:00
Hubblenaut
ac1f3c3530 Fixes overbloated closets 2015-05-18 18:34:25 +02:00
RavingManiac
22cafb9c48 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-05-17 17:01:43 +10:00
RavingManiac
f66cf9af05 get_mobs_in_view() renamed to get_mobs_or_objects_in_view(). Returns mobs or objects depending on specifications
Transmission of emotes, visible_message() and say() refactored. All three use get_mobs_or_objects_in_view() to find objects and mobs in containers

Storage objects and closets no longer transfer hear_talk(), see_emote() or show_message() to contents, as this is already covered by the above changes
2015-05-17 16:54:18 +10:00
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr
a101855343 Converted over hatchets and scythes. 2015-05-17 00:15:46 +09:30