Zuhayr
a6ec43f0b1
Merge pull request #10176 from mwerezak/ce-rig-fix
...
Fixes #8545
2015-07-15 06:48:45 +09:30
Zuhayr
c6d095aef1
Fixes #10118
2015-07-15 06:46:21 +09:30
GinjaNinja32
20b4a308db
Merge pull request #10174 from mwerezak/fire
...
Fixes liquid fuel fire progress being affected by non-existant gas
2015-07-14 20:27:37 +01:00
GinjaNinja32
bf4565fa4a
Merge pull request #10177 from LightningIron/dev-freeze
...
Fixes #9546
2015-07-14 20:27:06 +01:00
HarpyEagle
be34a7cfc7
Fixes projectiles ignoring their specified target zone
2015-07-14 14:20:53 -04:00
HarpyEagle
bf2bcba01c
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into ert-lights2
2015-07-14 10:15:37 -04:00
Zuhayr
d640e7c4ab
Merge pull request #10180 from PsiOmegaDelta/150714-TheLAAAW
...
Law set changes
2015-07-14 19:00:32 +09:30
PsiOmegaDelta
a44305ac90
Merge pull request #10175 from mwerezak/camerafix
...
Fixes #9509
2015-07-14 10:45:00 +02:00
PsiOmegaDelta
cb1e57eb4e
Law spelling corrections, removes some law sets from the law manager overview.
2015-07-14 09:01:13 +02:00
PsiOmegaDelta
9ffdb161dc
Compilation fixes.
2015-07-14 08:28:01 +02:00
PsiOmegaDelta
e2e08a226d
Removes update_canmove() proc in simple_animal/Life() as it's now called in living/Life().
2015-07-14 08:24:41 +02: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
LightningIron
ddafefe9bd
Vendors should no longer eat laptops if ID invalid.
2015-07-13 23:41:01 -05:00
mwerezak
5ab051d7a8
Fixes #8545
2015-07-14 00:38:58 -04:00
mwerezak
33fe2b5fc7
Makes grab eye attacking respect species lore better
2015-07-14 00:25:53 -04: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
mwerezak
53eedb5498
Fixes liquid fuel fire regression
...
The reaction progress needed to be clamped before used_fuel is
calculated, or else the will bleed into each other even though they are
clamped properly afterwards.
2015-07-13 20:45:57 -04:00
Zuhayr
b12d1d4bdd
Refactors spiderbots a little, cleans up some spans, updates them.
2015-07-14 06:56:52 +09:30
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
9376e33acf
Fixes #10159
2015-07-14 05:19:00 +09:30
Zuhayr
7bb9ca6ec2
Fixes #10129
2015-07-14 05:18:58 +09:30
Zuhayr
af7c87366e
Fixes #10137
2015-07-14 05:18:57 +09:30
Zuhayr
7dada28d8d
Fixes #10146
2015-07-14 05:18:57 +09:30
HarpyEagle
a93adb2710
Fixes #9868
2015-07-13 11:27:15 -04:00
HarpyEagle
e0f89532e0
Fixes #10078
2015-07-13 11:08:58 -04:00
HarpyEagle
883ce8b7c1
Merge remote-tracking branch 'upstream/dev-freeze' into ert-lights2
2015-07-13 10:46:48 -04:00
Ccomp5950
e6481d4a2c
Merge pull request #10168 from Kelenius/ofCowsAndTables
...
Fixes #8294
2015-07-13 10:03:38 -04:00
Kelenius
765731f7d5
Fixes #8294
...
Fuck mobcode.
2015-07-13 16:51:46 +03:00
Ccomp5950
9990fb05be
Merge pull request #10167 from PsiOmegaDelta/150713-MorgueTrays
...
Fixes #10143 .
2015-07-13 09:40:20 -04:00
Ccomp5950
0a71e88cb4
Merge pull request #10165 from PsiOmegaDelta/150713-ServerRevisionName
...
Further improves the server revision verb.
2015-07-13 09:36:09 -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
PsiOmega
b1c26003d0
Further improves the server revision verb.
...
Now also includes the current branch name.
2015-07-13 12:18:09 +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
Kelenius
678027d93d
Fixes #10145
2015-07-13 11:01:32 +03:00
PsiOmega
21407e5be6
Fixes #10128 .
...
Lawyers can now access security records.
2015-07-13 09:53:42 +02:00
PsiOmega
f601ba45d6
Fixes #10144 .
...
Fixed depricated type path.
2015-07-13 09:53:21 +02:00
Kelenius
0269d19bef
Borg reagent synths use links in chat and Topic()
2015-07-13 10:28:36 +03:00
mwerezak
0fc12eb22b
Fixes #9927
...
Fixes issues with deca code crates.
2015-07-13 00:45:36 -04:00
mwerezak
ba981f8783
Fixes glasses interfering with species vision modes and cult ghost viewing.
2015-07-12 20:21:38 -04:00
mwerezak
0b2b475be4
Adds lights to ERT shuttle, ERT ready light
...
Fixes #10155
2015-07-12 18:41:24 -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
