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
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
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
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
Zuhayr
b12d1d4bdd
Refactors spiderbots a little, cleans up some spans, updates them.
2015-07-14 06:56:52 +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
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
HarpyEagle
a93adb2710
Fixes #9868
2015-07-13 11:27:15 -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
889019b445
Merge pull request #10163 from PsiOmegaDelta/150713-Fixes
...
Fixes
2015-07-13 09:35:58 -04:00
Kelenius
678027d93d
Fixes #10145
2015-07-13 11:01:32 +03: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
Kelenius
79804f663e
Updates borg shaker and hypospray
...
Fixes #6937
Hypospray no longer contains a bunch of reagent holders
2015-07-12 19:50:02 +03:00
GinjaNinja32
b04ed47e2f
Merge pull request #10070 from Mloc/lightwrite-2
...
Lighting overlay changes + optimizations
2015-07-12 15:51:44 +01:00
Mloc
bd705fb7e0
optimize apply/remove_lum
...
Light sources no longer track applied lumcounts in an assocative list,
using shared-indices with the applied turf list instead.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-12 15:47:17 +01:00
Mloc
291f0b8556
client optimizations for lighting overlays
...
Removes lighting transitions- they don't work with the new system.
Greyscale overlays now use BLEND_OVERLAY instead of BLEND_MULTIPLY for
better client performance.
Light overlays in total darkness are now made invisible.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-12 15:47:13 +01:00
PsiOmegaDelta
7b3759c1f3
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/controllers/configuration.dm
code/modules/admin/topic.dm
config/example/config.txt
2015-07-12 14:49:31 +02:00
PsiOmegaDelta
2ed978b1e1
Wizards can no longer de-jaunt in turfs with dense objects.
...
Also fixes an exploit where wizards could cast CentCom restricted spells by hiding inside objects, such as lockers or coffins.
2015-07-12 14:31:26 +02:00
mwerezak
49e9248836
Fixes looking through cameras retaining the sight flags of worn glasses.
2015-07-11 23:27:18 -04:00
mwerezak
680a052136
Fixes check_eye() for AI, pAI, and helm console
...
reset_view() is no longer called every time check_eye() is. Instead it
is called only when the mob's eye should change.
2015-07-11 23:26:57 -04:00
Ccomp5950
325dfd9852
Merge pull request #10072 from NullSnapshot/adminfeatures
...
[Fast-track] Moderator tempban changes.
2015-07-11 23:21:49 -04:00
Zuhayr
7a4ed714d2
Merge pull request #10109 from GinjaNinja32/table
...
Fixes tables not connecting
2015-07-12 09:50:04 +09:30
GinjaNinja32
3b13199425
Fixes tables not connecting
2015-07-11 23:19:57 +01:00
PsiOmegaDelta
570c18881d
Merge pull request #10108 from Zuhayr/dev-freeze
...
Fixes #10062 and #10061
2015-07-12 00:14:24 +02:00
Zuhayr
c59dc2445c
Fixes #10062 and #10061
2015-07-12 07:04:35 +09:30
PsiOmegaDelta
796c6c7e42
Teleportation code now ignores dense objects with the ON_BORDER flag.
2015-07-11 17:30:40 +02:00
Null Snapshot
5b30703d30
Should be the last fixes needed.
2015-07-11 04:22:36 -07:00
PsiOmegaDelta
1287ad818a
Ninjas can no longer teleport unto turfs that contain solid objects.
2015-07-11 11:12:08 +02:00
