PsiOmegaDelta
23736bc42b
Merge pull request #10233 from Baystation12/master
...
Master -> Dev-freeze.
2015-07-18 22:45:44 +02:00
GinjaNinja32
49f8d1e675
Merge pull request #10228 from PsiOmegaDelta/150718-ToxicPhoron
...
Fixes #10220 .
2015-07-18 21:37:12 +01:00
Chinsky
3a40f4e539
Merge pull request #10225 from PsiOmegaDelta/150718-BurnItAway
...
Fixes #10170 .
2015-07-18 22:57:06 +03:00
PsiOmegaDelta
8b769c5d24
Merge pull request #10195 from Kelenius/ofSpaceAndWounds
...
Of space and wounds
2015-07-18 20:04:39 +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
PsiOmega
8aac45bc42
Fixes #10170 .
...
Overrides the AI attack proc.
Saving any removal of burners for the dev branch due to merge concerns.
2015-07-18 19:36:01 +02:00
Kelenius
4e2049ccaf
Removes a colon
2015-07-18 14:53:35 +03:00
PsiOmega
d1a05d9fd6
Compilation fixes.
2015-07-17 23:11:42 +02:00
PsiOmega
b4d15ceb6e
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/carbon/human/inventory.dm
2015-07-17 23:09:24 +02:00
GinjaNinja32
2035b8179d
Merge pull request #10213 from PsiOmegaDelta/150716-NDVIcarus
...
Fixes #10212 .
2015-07-16 21:12:56 +01:00
PsiOmega
4aa11441cc
Fixes #10212 .
...
NSV Icarus is now NDV Icarus.
2015-07-16 20:32:56 +02:00
HarpyEagle
bcd81af4f6
Bandaid fix for sealed rig removal
2015-07-16 10:52:26 -04:00
PsiOmegaDelta
dadb262ea1
Merge pull request #10192 from Kelenius/ofImprinterAndProhon
...
Of imprinter and prohon
2015-07-16 08:36:17 +02:00
GinjaNinja32
6ec39e1f51
Fixes 'plural' gender and fixes some instances of not using the t_* variables
...
Todo: fully rework this to not need lots of t_* variables, they're annoying and kinda crappy. Maybe a gender datum; /datum/gender/male/var/he = "he" or something.
2015-07-15 19:00:54 +01:00
Kelenius
b8a354467e
Fixes #9967
...
Pulling someone through space or an area without gravity will no longer
deal damage to them
2015-07-15 18:27:27 +03:00
Chinsky
a0e0cc5cd5
Merge pull request #10194 from GinjaNinja32/isAI
...
removes isAI() from broken merge
2015-07-15 18:26:32 +03:00
GinjaNinja32
efaf8659b8
Fixes usage of isAI()
2015-07-15 15:51:11 +01:00
GinjaNinja32
e2d7fd9e14
removes isAI() from broken merge
2015-07-15 15:45:55 +01:00
Kelenius
4c8dfcf17e
Fixes #10127 , fixes #10139
...
Removes phoron requirement from shield circuit, adds a return to sheet
adding so ..() is not called when attacked with a sheet.
2015-07-15 16:49:22 +03:00
Kelenius
3de25ceb00
Fixes #8161
2015-07-15 16:34:05 +03:00
Zuhayr
03927918c6
Merge pull request #10187 from Baystation12/master
...
Master > dev-freeze
2015-07-15 16:10:13 +09:30
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
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
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
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
