tkdrg
9a9f0bc058
Merge pull request #6691 from Menshin/clientless_peeking_runtime_fix
...
Fixes runtime with moving objects in/out of storage while clientless mobs peeking
2014-12-31 22:19:38 -03:00
tkdrg
cdb5066502
Merge pull request #6324 from Razharas/GenShit
...
Added datum mutations
2014-12-31 17:24:15 -03:00
Menshin
4db3268fcb
Fixes runtime when moving objects in/out storage while a clientless mob is peeking on the storage panel
2014-12-31 01:54:25 +01:00
Perakp
ee3617310e
Merge remote-tracking branch 'upstream/master' into droneFix
2014-12-30 13:32:51 +02:00
Razharas
10b21b20ab
Conflicts resolution
...
In items weapons melee misc
2014-12-29 11:49:30 +03:00
paprka
bbc83fed1c
Merge branch 'master' of https://github.com/tgstation/-tg-station into policebatonfixy
2014-12-28 18:39:39 -08:00
Razharas
76a21883a8
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
...
Conflicts:
code/game/mecha/mecha.dm
code/game/objects/structures/tables_racks.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/projectiles/gun.dm
Fixes dem conflicts
2014-12-28 11:20:15 +03:00
phil235
b6e35278e3
Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.
...
Fixes the washing machine being able to change boxing gloves, ninja gloves and botany gloves to look like simple colored gloves. Creating a /gloves/color category for all gloves whose color can be changed.
Fixing some absolute pathing.
2014-12-26 17:04:09 +01:00
Razharas
1b45752b05
Fixed conflicts
...
Ye again and again and again and again
Do it again, do it again~
2014-12-23 05:39:39 +03:00
hornygranny
126be2f312
Merge pull request #6483 from MrPerson/storage_war_hunter_kings
...
Always reset the layer of things removed from storage
2014-12-22 10:42:48 -08:00
Razharas
9a27fe7c8d
Conflict fix
...
Yeah makes it all work
2014-12-21 06:12:33 +03:00
MrPerson
2b763f18c1
Always reset the layer of things removed from storage
...
Fixes #6470
2014-12-19 09:42:06 -08:00
paprka
93166940f7
fixes singulo bombing
2014-12-17 02:25:33 -08:00
paprka
32f2028df1
Forgot to commit the locker changes
2014-12-16 22:38:51 -08:00
Razharas
f0c8f2eeac
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
conflicts resolution
2014-12-16 02:52:08 +03:00
Razharas
0b26a71a71
Merge pull request #6333 from tkdrg/singulobj
...
The singularity/narsie are no longer machines
2014-12-14 10:02:39 +03:00
Razharas
21a2c2d21e
Made clumsiness into disability
...
I really dont want to make clumsy_act()
2014-12-14 08:04:48 +03:00
Razharas
bafef911d4
Merge pull request #6317 from paprka/saltyfuckingcuntm8
...
Security aesthetic overhaul
2014-12-14 07:57:33 +03:00
Razharas
44cc6c6d97
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-14 03:07:13 +03:00
paprka
3bd3175a18
Removed unused armbands
2014-12-13 00:14:03 -08:00
tkdrg
79e8ad4142
The singularity/narsie are no longer machines
2014-12-12 19:42:37 -03:00
Razharas
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
paprka
e9477cfe9d
initial commit for better security clothing
2014-12-11 11:50:52 -08:00
Hornygranny
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
paprka
9e9b8b440d
adds winter coats and changes labcoat toggling
2014-12-04 21:29:21 -08:00
Cheridan
f909d59d1a
Merge pull request #6130 from phil235/AttackMsgStandardizedFormat
...
Standardizing attack messages to always show the attacker first
2014-12-04 12:45:31 -06:00
phil235
dcb48e3168
Merge branch 'master' of https://github.com/tgstation/-tg-station into SpanFix1
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-12-03 18:59:32 +01:00
Swag McYolosteinen
1d6a7cf031
Merge pull request #6106 from Razharas/StorageFix
...
Fix for storages and equip
2014-12-03 17:50:58 +01:00
Remie Richards
88ad308825
Merge pull request #6144 from Menshin/storage_calling_super
...
Made obj/item/weapon/storage call ..() on New()
2014-12-03 16:38:43 +00:00
xxalpha
260ee75c9a
Fixes several description related issues with fancy storage
2014-11-30 22:03:25 +00:00
Menshin
efb50e374a
Made obj/item/weapon/storage call ..() on New()
2014-11-30 03:14:49 +01:00
Perakp
7f357963bd
- Fixes belts getting stuck in drone inventory. Fixes #5563 .
...
- Gives drones the ability to interact with APCs and air alarms without requiring them to have an ID card. Fixes #5565 .
- Drones have to be adjacent to the APC/alarm when using it, for balance.
2014-11-29 14:36:36 +02:00
phil235
22e0771eb9
Fixes more span classes. Replaces some "for() show_message()" with "visible_message()". Adding a suicide message for slimes. Fixes simple_animal/corgi having two attackby procs.
2014-11-28 16:08:59 +01:00
Razharas
876a5b1bfb
Fix for storages and equip
...
Yeah
2014-11-27 19:28:03 +03:00
phil235
86405fa8c0
Standardizes attack messages to always show the attacker first (when there is an attacker).
...
Replacing some fo mob in viewers() show_message() with visible message().
Simplifying some message code in a couple places, fixing typos and span classes.
2014-11-24 01:49:34 +01:00
Hornygranny
678a13c451
moves emag effects from attackby() into atom proc emag_act()
2014-11-20 17:49:06 -08:00
tkdrg
e03c5129da
Makes storage items update properly on insertion
...
Previously, it would only update the storage view for usr, so it would
look wrong to any other players which are interacting with the same
storage item at the same time.
2014-11-20 14:00:17 -03:00
Razharas
4f81da5bdf
Merge pull request #5797 from Steelpoint/BeltFix
...
Fix: SecBelts can hold Tear Gas Grenades
2014-11-15 01:03:46 +03:00
Remie Richards
17607d0aa2
Merge pull request #5776 from MrPerson/throwing_changes
...
Throwing bugfixes
2014-11-14 18:04:00 +00:00
Menshin
cdd5128d47
Removed hilarious but useless sleep() in closets/boxes New()
2014-11-10 01:59:32 +01:00
Steelpoint
e02e2f5c0b
TearGas
2014-11-10 02:16:46 +08:00
MrPerson
c159878ace
Throwing bugfixes
...
Removed an unused client verb, changed a usr to src where they're the same mob, and changed a type == check to istype().
Allow turning on throw mode when clicking the UI button (hotkeys already allow you to do this).
Disallow throwing when not on a turf.
Fixes #4823
Make storage items close out the onscreen stuff when they get thrown.
Fixes #5296
2014-11-09 00:29:20 -08:00
Cheridan
15b16e1f67
Merge pull request #5726 from paprka/traitorbeltthing
...
Adds disguised med analyzer to medibelts
2014-11-07 23:39:56 -06:00
Cheridan
3f16a966b2
Merge pull request #5712 from xxalpha/amilli
...
Increases gold content per Robust Gold cigarette to 1
2014-11-07 10:09:54 -06:00
paprka
e5db75d756
adds disguised med analyzer to medibelts
2014-11-06 21:36:54 -08:00
xxalpha
e1a06faa9b
Increases gold content per Robust Gold cigarette to 1
2014-11-06 18:23:48 +00:00
paprka
b99499e277
fixes utility medipen bundle for miners
2014-11-05 18:02:14 -08:00
hornygranny
b8f0ef4efe
Merge pull request #5541 from xxalpha/cigarettes
...
New Cigarette Packs
2014-11-03 18:49:29 -08:00
hornygranny
7e4688e3f6
Merge pull request #5427 from paprka/littlejanitorthings
...
Soap, lube, and janitor tweaks
2014-11-03 17:19:37 -08:00
hornygranny
6e11157661
Merge pull request #5520 from paprka/minerscrubs
...
Improves mining equipment prices, rebalances medipens
2014-11-03 17:12:02 -08:00
