b983176937
Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2014-12-14 11:59:45 -03:00
a1f3a51dab
Adds Librarian PDA cartridge
2014-12-14 13:59:35 +01:00
5071d307b0
Can now click switch with any object
2014-12-14 12:22:15 +01:00
0b26a71a71
Merge pull request #6333 from tkdrg/singulobj
...
The singularity/narsie are no longer machines
2014-12-14 10:02:39 +03:00
303564638b
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
code/game/jobs/job/security.dm
2014-12-13 22:58:22 -08:00
db6eabfc4e
intial commit for syndicate hardsuit feature
2014-12-13 22:26:09 -08:00
21a2c2d21e
Made clumsiness into disability
...
I really dont want to make clumsy_act()
2014-12-14 08:04:48 +03:00
bafef911d4
Merge pull request #6317 from paprka/saltyfuckingcuntm8
...
Security aesthetic overhaul
2014-12-14 07:57:33 +03:00
0df50e5c6e
Adds distinct sprites for the chemical closet.
2014-12-13 22:04:43 -06:00
44cc6c6d97
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-14 03:07:13 +03:00
536c0b55a5
Morgue update
2014-12-13 12:42:49 +01:00
3bd3175a18
Removed unused armbands
2014-12-13 00:14:03 -08:00
40943d5684
reverts some sechailer and other feature things
2014-12-13 00:09:58 -08:00
c104ad6cd4
Merge pull request #6323 from AndroidSFV/fix6313
...
Fixes 6313
2014-12-12 23:01:43 -06:00
79e8ad4142
The singularity/narsie are no longer machines
2014-12-12 19:42:37 -03:00
8d110ee496
Tiny clean up, still lots of work to do
...
Only compiletested, these changes were never tested in the game yet
2014-12-12 23:57:11 +03:00
868f29ada7
reverts armband change
2014-12-12 10:53:35 -08:00
621d3d936a
Fixes disappearing alien weeds overlays
...
I have no idea why this works.
Fixes #6326
2014-12-12 14:29:32 -03:00
3a0927febd
Fixes 6313
2014-12-12 11:16:54 -06:00
5307ec5e96
Fixes some backwards logic
2014-12-12 16:48:06 +00:00
cdbd40f796
Adds a new step_trigger, "sound_effect", acts as a mapper friendly wrapper for playing sound effects
...
Adds a new step_trigger variable, "mobs_only", like affects_ghosts this is a boolean for allowing/denying atom/movables from triggering step_triggers
playsound_local() is now a /atom proc, all mob specific requirements have been moved to an override
2014-12-12 16:35:16 +00:00
11f6c7c401
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-12 04:51:16 +03:00
0921aa201f
Added datum mutations
...
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03:00
98a865298a
Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor
...
Conflicts:
code/game/mecha/mech_fabricator.dm
2014-12-11 13:53:37 -08:00
76f7765c7b
lockers for boxes
2014-12-11 12:13:13 -08:00
e9477cfe9d
initial commit for better security clothing
2014-12-11 11:50:52 -08:00
27793609d8
Merge pull request #6201 from fleure/togglefix
...
Fixes toggling watertank nozzle in hands with verb
2014-12-11 12:21:32 -06:00
3ede77face
Merge pull request #6189 from Menshin/exofab_revamp_end+fixes
...
Exofab revamp finishing and fixes
2014-12-11 11:52:16 -06:00
2619beccdf
Merge pull request #6270 from optimumtact/iflashedu
...
Fix flash messages when failing to flash
2014-12-11 06:35:29 -06:00
dc01a092af
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/obj/gun.dmi
2014-12-10 23:55:51 -08:00
f9cf4f233d
Merge pull request #6263 from paprka/gunsthegunnening
...
Guns: the gunnening
2014-12-11 10:46:34 +03:00
7d83830365
Merge pull request #6268 from tkdrg/yum
...
Changes weed overlay border layer to match weeds
2014-12-10 16:55:13 -08:00
ece2bb00c3
Merge pull request #6242 from Dorsisdwarf/RCDbuff
...
Buffs the RCD
2014-12-10 06:23:28 -06:00
698acf1cac
adds disablers to security lockers whoops
2014-12-10 01:18:02 -08:00
e53f8294d7
initial commit for nerfing ranged stuns
2014-12-10 00:16:53 -08:00
8175bd91e0
Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound.
2014-12-09 19:38:49 -08:00
99f364f480
makes APC call parent
2014-12-09 18:53:29 -08:00
f34fcd6124
overrides attack
2014-12-09 18:10:17 -08:00
947074d085
Adds the handheld crew monitor.
2014-12-09 19:42:54 -05:00
72132b1bf1
fixes whitespace
2014-12-09 16:32:16 -08:00
af3f1aa4d8
Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor
...
Conflicts:
code/game/machinery/deployable.dm
code/game/objects/items/weapons/storage/lockbox.dm
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
code/modules/clothing/glasses/hud.dm
code/modules/mob/living/silicon/robot/robot.dm
2014-12-09 16:03:45 -08:00
d529235696
Merge pull request #6187 from phil235/GrilleWindowFix
...
Fixes being able to place multiple fulltile window on a grille.
2014-12-09 12:51:05 -06:00
0b32dc97a7
Merge pull request #6136 from optimumtact/patch-3
...
Grille throwforce is now halved against grilles, instead of -5
2014-12-09 05:31:32 +03:00
41f0d0e04f
Fix flash messages when failing to flash
...
It would give the success message when flashing carbons even if the flash
had actually failed to work
2014-12-09 09:38:26 +13:00
bce24d96c9
Changes weed overlay border layer to match weeds
...
Fixes #6237
2014-12-08 15:47:59 -03:00
4237c406e4
Merge branch 'master' of https://github.com/tgstation/-tg-station into fashionandfashionaccesories
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
2014-12-08 13:53:31 -03:00
12279d9c8e
Adds a santa event where a dead player is spawned as Santa! HO HO HO!
...
Also adds a few more things to the random gifts.
2014-12-08 17:03:52 +01:00
b828448645
Merge pull request #6228 from paprka/coatscoats
...
Adds winter coats and changes labcoat toggling
2014-12-08 11:35:56 +01:00
bff2e62a0f
Merge pull request #6175 from Razharas/ExActFix
...
Fixes ex_act() destroying too much shit
2014-12-08 08:03:35 +01:00
bf207efa9a
santa hats for sec and sprite tweak
2014-12-07 20:22:54 -08:00
tkdrg
AnturK
Daniel Hultgren
Razharas
paprka
Razharas
TZK13
Cheridan
AndroidSFV
Remie Richards
Hornygranny
Cuboos
Xhuis
oranges
Miauw