Snapshot
aa97514c4a
Merge pull request #10075 from comma/dev-freeze
...
Couple hacky fixes
2015-07-09 14:25:56 -07:00
HarpyEagle
cf88e87434
Fixes mounted RCD balance issues
2015-07-09 16:54:01 -04:00
Null Snapshot
f2e27a8c89
fixes #8391
2015-07-09 13:23:13 -07:00
Chinsky
1993935766
Fixes #9899
2015-07-09 23:17:06 +03:00
Chinsky
5b627cc763
Fixes #9939
2015-07-09 23:07:28 +03:00
Null Snapshot
87c8be10dd
spans and grammar for topic.dm
2015-07-09 12:26:32 -07:00
Null Snapshot
dcaa8289a1
Fix for missed if(A | B) else if (b) check.
2015-07-09 12:26:11 -07:00
Null Snapshot
909798a8ef
Actual implementation of mod_can_(job_)tempban and mod_(job_)tempban_max
2015-07-09 12:11:27 -07:00
Null Snapshot
a28d3cd9d1
Added new config variables for toggling moderator tempban permissions and maximum duration for bans.
2015-07-09 12:10:18 -07:00
Mloc
278a4c38ec
get rid of mob.see_in_dark and species.darksight
...
They don't work with the current lighting system and cause weird artifacts.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-09 19:17:04 +01:00
Chinsky
c7d9ce4697
Merge pull request #10046 from mwerezak/custom-item-icons
...
Makes custom items use the host item's inhand sprites if none are provided, knife fixes
2015-07-09 20:52:38 +03:00
Chinsky
7d9b7e10f4
Merge pull request #10038 from PsiOmegaDelta/150707-HellUniverseOptimizations
...
Reduced Hell Universe Lag
2015-07-09 20:45:51 +03:00
Zuhayr
d047311931
Should fix #9895 , hopefully.
2015-07-10 01:21:12 +09:30
Zuhayr
946c445b29
Fixes #9896
2015-07-10 01:14:12 +09:30
GinjaNinja32
f3d09e092e
Removes the approximations cheap_pythag and cheap_hypotenuse, since they're anything *but* cheap
2015-07-09 16:25:47 +01:00
Zuhayr
20f93b6009
Fixes #9394
2015-07-10 00:21:17 +09:30
Zuhayr
07bd7ef684
Fixes #9610
2015-07-10 00:06:07 +09:30
Mloc
ffbf547923
Merge pull request #9889 from PJB3005/bay-lights
...
Lighting optimizations + NVG meson fix
2015-07-09 14:50:10 +01:00
GinjaNinja32
05c280ff2d
Merge pull request #10064 from Kelenius/ofVotesAndLinks
...
Fixes #9894
2015-07-09 10:38:03 +01:00
Kelenius
879fc98a8c
Fixes #9894
2015-07-09 11:50:42 +03:00
Kelenius
12fdb7521a
Fixes #9908
2015-07-09 11:29:49 +03:00
Kelenius
42a9032e78
Hive dismantling, build timer, smoker sprite
2015-07-09 10:47:00 +03:00
PsiOmegaDelta
df83203356
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/hydroponics/seed_mobs.dm
code/modules/materials/materials.dm
2015-07-09 08:45:49 +02:00
PsiOmegaDelta
3751e1cdbf
Merge pull request #10055 from Zuhayr/dev-freeze
...
Fixes.
2015-07-09 08:35:06 +02:00
PsiOmegaDelta
14acf43646
Merge pull request #10059 from Baystation12/master
...
Dev-freeze
2015-07-09 08:34:43 +02:00
Zuhayr
9d02b41ae7
Emergency workaround for the observer bug.
2015-07-09 11:01:42 +09:30
Atlantis
e37503dedb
Fixes #9965
...
- Hardsuit injectors now only work on carbon-based mobs. This prevents injecting of AIs, Robots and other silicon-based mobs.
2015-07-08 21:44:04 +02:00
HarpyEagle
f23c2d5e00
Fixes droplimb wound not handling damage type
2015-07-08 15:17:50 -04:00
Zuhayr
e4fdf84ef7
Fixes #10054 , fixes some mushroom issues.
2015-07-09 04:25:36 +09:30
Zuhayr
d47c2c8a02
Fixes #10013
2015-07-09 04:05:40 +09:30
Zuhayr
550ea5f127
Fixes #9740
2015-07-09 03:40:26 +09:30
Zuhayr
76571bf758
Fixes #9646
2015-07-09 03:29:24 +09:30
ccomp5950
0f764d8779
Admins will no longer see stars when viewing faxes.
...
If an admin wasn't human / ghosting / or a silicon mob they would see garbled text.
This uses the "force view" setting to 1 bypassing the check.
Fixes #10050
2015-07-08 10:47:22 -04:00
Kelenius
53152abfd9
More sprites, span.
2015-07-08 17:00:09 +03:00
Kelenius
876dde550a
Beekeeping: spans, sprites, wood recipes, fixes
2015-07-08 12:55:55 +03:00
Kelenius
33a6cac0e1
Removes old hives
2015-07-08 12:55:53 +03:00
Kelenius
c5b98782d5
Adds a new type of beehives
...
Needs sprites, and removal of old beehives.
2015-07-08 12:55:37 +03:00
PsiOmegaDelta
746ac180aa
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-08 09:11:47 +02:00
PsiOmegaDelta
2de04f110d
Merge pull request #10048 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-07-08 09:10:42 +02:00
PsiOmegaDelta
f1a790f162
Fixes duplicate var definition.
2015-07-08 09:05:55 +02:00
PsiOmegaDelta
16abe8148a
Relocates drone law update to the new law set location.
2015-07-08 08:58:38 +02:00
PsiOmegaDelta
e18472c444
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/datums/ai_laws.dm
code/modules/hydroponics/spreading/spreading.dm
2015-07-08 08:57:48 +02:00
Zuhayr
89f93d4aac
Fixes an issue with plants.
2015-07-08 16:08:59 +09:30
PsiOmegaDelta
beeef3d66f
Changes the RCON computer to use the power screen instead.
2015-07-08 08:37:07 +02:00
mwerezak
471ee6a763
Updates to job economic modifiers
2015-07-08 01:54:08 -04:00
mwerezak
8957412826
Custom items default to the inhands of the parent
...
Makes custom items use the inhand states and icons of the parent item
type if inhand states are not present in CUSTOM_ITEM_MOB.
Makes item_icons take precedence over icon_override for inhands only.
2015-07-08 01:39:02 -04:00
mwerezak
01104eda45
Fixes utensil force dividers.
...
Fixes utensil knives deal more damage than a chopping knife, and spoons being a potentially deadly weapon.
2015-07-08 01:37:07 -04:00
Zuhayr
97c1822be0
Merge pull request #10015 from Dragor/patch-1
...
Rewording of maintenance drone laws
2015-07-08 05:51:16 +09:30
Zuhayr
b8623859b0
Merge pull request #10029 from mwerezak/vines
...
Stops sampling from being a means of fighting vines
2015-07-08 05:50:22 +09:30
GinjaNinja32
27911bb7ad
Fixes num2hex
2015-07-07 18:02:59 +01:00
