Mloc
4413356a63
fix some weirdness with wall damage overlays
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-30 19:17:23 +01:00
Mloc
3461b7fb5c
minor antag distribution fix
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-30 19:17:17 +01:00
Mloc
fe4490a295
fixes #10316
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-26 20:53:13 +01:00
PsiOmega
659b07415d
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/machinery/rechargestation.dm
code/game/mecha/equipment/tools/medical_tools.dm
maps/exodus-1.dmm
2015-07-26 10:00:12 +02:00
PsiOmega
13ca02677c
Fixes #10203 .
...
setup_economy() was previously called twice, the removed call happened before character creation.
Moves the remaining line to ensure proper setup order.
2015-07-25 14:08:19 +02:00
Chinsky
cc75e8d220
Merge pull request #10271 from mwerezak/recharging-station
...
Fixes #10003
2015-07-25 05:33:21 +03:00
Zuhayr
1851ec58cd
Merge pull request #10277 from GinjaNinja32/changelingtypo
...
Fixes typo in changeling absorbing
2015-07-25 00:23:37 +09:30
PsiOmegaDelta
9b0497e01e
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-07-24 10:46:32 +02:00
GinjaNinja32
006ed3ec53
Fixes typo in changeling absorbing
2015-07-24 02:35:49 +01:00
PsiOmegaDelta
83289c1b78
Merge pull request #10273 from Kelenius/ofRobotsAndBoxes
...
Of robots and boxes
2015-07-23 09:15:46 +02:00
Kelenius
7efaab0ab4
Fixes #9540 - borg message when using DA on storage
...
Radically. Frankly, this message is useless.
2015-07-23 10:10:10 +03:00
mwerezak
8b81dadfc5
More cleanup
...
Removes dynamic member lookup in rechargestation.dm. Removes unused proc allow_drop().
2015-07-23 01:56:39 -04:00
mwerezak
f0bfd03898
Updates recharge station desc when parts are refreshed
2015-07-23 00:07:28 -04:00
mwerezak
d353f30fc1
Fixes #10003
...
Fixes numerous issues with cyborg recharging stations, such as incorrect
power use, runtimes when cyborgs exit the station, and odd things like
if(NOPOWER|BROKEN).
2015-07-23 00:06:39 -04:00
Kelenius
76fb9ca357
Fixes #9550 - beakers hit microwaves
2015-07-22 12:40:16 +03:00
Kelenius
d509bdbbfe
Uses capitalize()
2015-07-21 11:58:39 +03:00
Kelenius
6b2daae752
Fixes #6264 - labeling janicart messes its ui
...
Janicart now uses nanoui and is immune to labeling screwing up its
interface
I've even resisted making pointless spacing changes this time!
2015-07-20 16:27:58 +03:00
Zuhayr
c4a8ad1156
Merge pull request #10206 from Kelenius/ofBruisesAndBandages
...
Of bruises and bandages
2015-07-19 20:15:47 +09:30
Zuhayr
a45d26079f
Merge pull request #10239 from mwerezak/lighting-fix
...
Fixes #10210
2015-07-19 20:13:55 +09:30
PsiOmegaDelta
faa45bfa6f
Merge pull request #10240 from mwerezak/machine-frame-fix
...
Fixes #10218
2015-07-19 10:57:17 +02:00
mwerezak
b5ed18e980
Fixes #10218
2015-07-19 00:36:18 -04:00
mwerezak
d3717a23a0
Removes unlimited_power var
...
Redundant and only used in one place.
2015-07-19 00:33:17 -04:00
PsiOmegaDelta
23736bc42b
Merge pull request #10233 from Baystation12/master
...
Master -> Dev-freeze.
2015-07-18 22:45:44 +02:00
PsiOmega
67a6480941
Fixes #10220 .
...
For the sake of consistency between mapped in and created phoron canisters, if nothing else.
2015-07-18 19:58:09 +02:00
Kelenius
7e8622b76a
Fixes #8210
...
Medicine stacks will now give one message per item category.
For example:
You clean and seal an ugly ripped cut and a ripped cut on Kelenius's
right arm.
You clean and seal an ugly ripped cut and a cut on Kelenius's left arm.
You clean and seal a cut, a cut, and a cut on Kelenius's left arm.
Code cleanup, spanclasses, spacing, stuff.
2015-07-17 09:24:13 +03:00
GinjaNinja32
bf4565fa4a
Merge pull request #10177 from LightningIron/dev-freeze
...
Fixes #9546
2015-07-14 20:27:06 +01:00
PsiOmegaDelta
a44305ac90
Merge pull request #10175 from mwerezak/camerafix
...
Fixes #9509
2015-07-14 10:45:00 +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
LightningIron
ddafefe9bd
Vendors should no longer eat laptops if ID invalid.
2015-07-13 23:41:01 -05:00
mwerezak
1da23e9dd7
Fixes #9509
2015-07-13 22:16:35 -04:00
LightningIron
1e1b741ef9
Fixes #9546 .
2015-07-13 20:42:40 -05:00
Zuhayr
61df28fe62
Reverting an accidentally committed test change.
2015-07-14 05:19:01 +09:30
Zuhayr
5e1ae26b74
Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.
2015-07-14 05:19:01 +09:30
Zuhayr
cd380aba24
Removed the last few references to MODE, fixed some oversights with player_is_antag().
2015-07-14 05:19:00 +09:30
Zuhayr
965ab355e2
Fixes #10157
2015-07-14 05:19:00 +09:30
Zuhayr
7bb9ca6ec2
Fixes #10129
2015-07-14 05:18:58 +09:30
Zuhayr
7dada28d8d
Fixes #10146
2015-07-14 05:18:57 +09:30
HarpyEagle
e0f89532e0
Fixes #10078
2015-07-13 11:08:58 -04:00
Ccomp5950
9990fb05be
Merge pull request #10167 from PsiOmegaDelta/150713-MorgueTrays
...
Fixes #10143 .
2015-07-13 09:40:20 -04:00
Ccomp5950
889019b445
Merge pull request #10163 from PsiOmegaDelta/150713-Fixes
...
Fixes
2015-07-13 09:35:58 -04:00
PsiOmega
e11ffcdfc9
Fixes #10143 .
...
Morgue/crematorium trays should now garbage collect properly.
2015-07-13 15:06:02 +02:00
Kelenius
e8bc544a92
Fixes #10150
2015-07-13 11:44:47 +03:00
PsiOmega
64cda4aa5a
Destroyed items now use drop_from_inventory instead of unEquip. Reduces the risk of references being kept in case of held items.
2015-07-13 10:20:46 +02:00
PsiOmega
9ba21f3079
Tried to resolve ID cards not GCing properly. Sorted some awful : uses instead.
2015-07-13 10:18:08 +02:00
PsiOmega
750c3f9e66
Puts the world end handling inside a spawn instead of sleep.
2015-07-13 10:13:45 +02:00
PsiOmega
21407e5be6
Fixes #10128 .
...
Lawyers can now access security records.
2015-07-13 09:53:42 +02:00
mwerezak
0fc12eb22b
Fixes #9927
...
Fixes issues with deca code crates.
2015-07-13 00:45:36 -04:00
Zuhayr
52cc850bf8
Merge pull request #10115 from PsiOmegaDelta/150712-SolidJaunting
...
Wizards can no longer de-jaunt in turfs with dense objects.
2015-07-13 06:14:44 +09:30
Chinsky
dabdbf529c
Fixes several jobs not spawning with their prefered lootbag.
...
Added a proc that spawns it for those jobs that didn't put a bag on in their 'equip' proc. There's just too many of those to move thme out in override for that proc and some jobs (like miners) depend on knowing if bag is there or not. It won't spawn second bag if first one is there anyway.
2015-07-12 19:29:29 +03:00
GinjaNinja32
b04ed47e2f
Merge pull request #10070 from Mloc/lightwrite-2
...
Lighting overlay changes + optimizations
2015-07-12 15:51:44 +01:00
