PsiOmegaDelta
9057655da6
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/clothing.dm
code/modules/clothing/spacesuits/spacesuits.dm
code/modules/clothing/spacesuits/void/merc.dm
code/modules/clothing/spacesuits/void/void.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/silicon/ai/ai.dm
2015-08-24 10:31:30 +02:00
PsiOmegaDelta
c376c08cc0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/girders.dm
code/modules/mob/living/carbon/human/human_damage.dm
2015-08-24 10:23:12 +02:00
mwerezak
d62ff87ec9
Fixes #10689
...
Also some refactoring of locker stuffing.
2015-08-22 14:32:15 -04:00
Zuhayr
edf74e4721
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/admin/topic.dm
2015-08-22 02:30:14 +09:30
Zuhayr
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
Zuhayr
6c27a8dd8d
Merge pull request #9159 from Kelenius/ofClicksAndCooldowns
...
Removes click cooldowns almost everywhere.
2015-08-22 01:51:05 +09:30
Kelenius
bed03443d1
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/ZAS/Airflow.dm
code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03:00
PsiOmegaDelta
56523d0941
Cleans out (mostly) unused access definitions and makes access lists sorted.
2015-08-21 14:45:45 +02:00
Hubblenaut
d2e2574f07
Merge remote-tracking branch 'upstream/dev' into dev
2015-08-16 20:39:50 +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
PsiOmega
3a08e2884a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/crates_lockers/largecrate.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/research/circuitprinter.dm
2015-08-15 10:52:17 +02:00
Null Snapshot
0255b79114
Fixes a problem with crates containing animals not spitting out their mobs.
2015-08-14 22:47:53 -07:00
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
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
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
