Zuhayr
9dfe54d514
Added a click delay to interactions with the fire axe cabinet.
2015-12-02 20:28:18 +10:30
PsiOmegaDelta
11e47bc8c2
Fixes being unable to emag secure closets.
...
And ensures that this costs an emag charge.
Also corrects emag_act calls. Partial port of https://github.com/PolarisSS13/Polaris/pull/377 .
2015-12-02 08:30:47 +01:00
Zuhayr
9a3038a85c
Generalized pulling restrictions to mob level.
2015-12-01 21:23:35 +10:30
Kearel
5cc2944733
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2
2015-11-28 11:21:07 -06:00
PsiOmegaDelta
f74d9e6862
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
html/changelogs/.all_changelog.yml
maps/exodus-1.dmm
2015-11-22 11:48:00 +01:00
PsiOmegaDelta
26f167453c
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-11-22 11:40:44 +01:00
Zuhayr
9c0ae7fb01
Merge branch 'auroraforensics' of https://github.com/Zuhayr/Baystation12 into dev
2015-11-22 19:45:55 +10:30
Bjorn Neergaard
ef1f91e334
Fix Laptop Vendors and Personal Lockers not accepting ID Containers
...
Fixes #11092
2015-11-22 00:27:03 -06:00
Kearel
a8406f018b
Adds Entertainment Items
...
Adds the following:
Actor Guild for ghosts to spawn at.
Board for playing board games.
Two trading card games with booster packs.
Tarot cards.
Cargo can now supply lasertag equipment as well as decks/booster packs
2015-11-12 23:24:34 -06:00
Chinsky
1417f4f40b
Merge pull request #11344 from Hubblenaut/tape
...
Tape - Sprites and Algorithm Changes
2015-11-02 00:10:03 +03:00
PsiOmegaDelta
a9f7b3a325
Merge pull request #11247 from Hubblenaut/laundry
...
Adds laundry basket
2015-10-31 11:16:14 +01:00
Zuhayr
1244c4a5fd
Porting forensics from Aurora.
2015-10-24 02:15:06 +10:30
Hubblenaut
ef591fa2b3
Atmos personal locker spawn with atmos tape roll
2015-10-22 14:31:07 +02:00
Hubblenaut
ba19c28c33
Adds laundry basket
2015-10-09 17:03:41 +02:00
Kelenius
83adba88d4
Updates blob
...
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106 .
Fixes #10705 .
2015-10-05 18:10:16 +03:00
PsiOmegaDelta
d891fba1cc
Mob size tweaks.
...
Merges the use of the is_small and mob_size into one.
Changes the species size handling to set the mob size instead of being yet another separate var to check.
2015-09-20 17:12:07 +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
0c21ef741e
Fixes #10988 .
...
Lights now update when objects are moved into crates and lockers.
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1926 .
2015-09-12 20:43:24 +02:00
Zuhayr
e27eda4c86
Merge pull request #10672 from mwerezak/frag-grenade
...
Adds fragmentation grenades
2015-09-07 14:12:27 +09:30
Chinsky
a3b3e52959
Merge branch 'dev' of https://github.com/comma/Baystation12 into technoir
2015-09-02 04:38:26 +03:00
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
MrSnapwalk
d45d46f920
Resprites, renames, and repaths the detective uniforms.
2015-08-22 19:43:28 -05: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
mwerezak
77ddae4e26
Structures now take damage properly from projectile clouds
2015-08-15 19:08:45 -04: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
