f35e614150
Merge pull request #10958 from caelaislinn/emitter_fix
...
Fixes emitter runtime by using new calling syntax
2015-08-31 08:58:07 +02:00
14c57fcf11
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/mob/holder.dm
icons/mob/head.dmi
2015-08-31 16:17:24 +09:30
1de511b545
fixes emitter runtime by using new calling syntax
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2015-08-31 16:41:43 +10:00
8c61c3ab6f
Fixes multi-z things.
2015-08-30 18:58:37 -07:00
ac04bdfb52
Readded monkey scooping.
...
Conflicts:
code/modules/mob/living/carbon/human/species/species.dm
2015-08-31 07:01:56 +09:30
772c320303
Multi-Z.
2015-08-30 14:15:20 -07:00
fa566fbe47
[Botany] Gas-related traits revealed on the plant analyzer
...
http://baystation12.net/forums/threads/the-little-things-4-with-a-vengance.9/page-11#post-10909
2015-08-30 11:58:39 -04:00
0bd41e604b
Merge remote-tracking branch 'upstream/dev' into Backup
2015-08-30 15:55:10 +02:00
6165b6fee3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/material/shards.dm
2015-08-30 10:23:14 +02:00
88250ad57f
Merge pull request #10939 from Baystation12/master
...
Dev-freeze
2015-08-30 10:20:32 +02:00
92d3e6d240
Fixes Yongauni#155
2015-08-30 11:45:54 +09:30
bfa54052f8
Merge pull request #10891 from Peliia/Peliia-patch-1
...
Virology Tiny Fixes
2015-08-29 23:27:15 +03:00
9edeb3cc08
Merge pull request #10908 from Matthew951/8-27-2015-adds-Volaju-hair
...
Adds a new set of hair and facial hair
2015-08-29 23:26:30 +03:00
e1aa20fda5
Radio changes.
...
Removes the radio free range option.
Instead all users can move within the standard radio frequency range, while authorized users can also select department channels.
2015-08-29 17:12:48 +02:00
35ea424edc
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/modules/clothing/spacesuits/rig/rig.dm
2015-08-29 10:06:18 +02:00
dfbdd79375
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev
2015-08-29 16:53:42 +09:30
7d82e4850e
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2015-08-29 16:53:07 +09:30
165f30b274
Merge pull request #10906 from PsiOmegaDelta/150827-RoundTime
...
Alters the round duration format, increases Stat inactivity timeout.
2015-08-29 07:41:23 +09:30
db8aefb121
Refactors duplicate parry code
2015-08-28 14:39:28 -04:00
3e967872a3
Allows grabs to be resisted while weakened
2015-08-28 14:08:59 -04:00
d5b618adac
Fix Say ":i" working with intercoms, re-add restraint check for Say ":i"
...
See also commits:
e9d9ff57babbc8ad6383b9dbeeb356
2015-08-28 17:33:52 +02:00
daef0ccec8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-28 11:27:20 +02:00
ff7a4fc244
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/events/event_container.dm
2015-08-28 11:18:57 +02:00
c642e8c729
Merge pull request #10907 from PsiOmegaDelta/150827-AdminLogs
...
Improved admin logging.
2015-08-28 10:32:35 +03:00
916530f3dc
Merge pull request #10911 from GinjaNinja32/table-defines
...
improve defines in table code
2015-08-28 07:27:12 +02:00
a286bd24b4
improve defines in table code
...
the defines were inverted, this uninverts them
also fixes #undef of old names for things
2015-08-28 00:12:18 +01:00
78a129db9d
Adds a new set of hair and facial hair
...
- Adds "Volaju" hair to sprite_accessories
- Adds "Volaju" facial hair to sprite_accessories
- Adds two new icons to human_face.dmi corresponding to the above
2015-08-27 14:47:02 -04:00
23f5581a35
Merge pull request #10894 from mwerezak/moderate-virus
...
Makes moderate virus events one-shot
2015-08-27 19:46:11 +01:00
f68275d91b
Improved admin logging.
...
log_and_message_admins() (which sure needs a shorter name) now uses key_name_admin() instead of just key_name().
Replaces calls to admin_log_and_message_admins() which did this with log_and_message_admins() instead.
2015-08-27 20:20:20 +02:00
c5e09c30d6
Alters the round duration format, increases Stat inactivity timeout.
...
Round duration now has a similar format to round time.
Stat inactivity timeout is now 10 minutes instead of 1 minute.
2015-08-27 20:01:38 +02:00
5873026915
Adds missing message assignment. Removes now unnecessary message formatting.
2015-08-27 19:35:44 +02:00
8743cd89a4
Dish Incubator v2
...
Adheres to pointers laid out by Ginja.
2015-08-27 18:59:16 +02:00
bf3040cc2d
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-27 09:01:50 +02:00
d293b9ea25
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/ZAS/Controller.dm
code/modules/admin/verbs/adminsay.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/stripping.dm
code/modules/mob/living/carbon/human/update_icons.dm
2015-08-27 08:53:22 +02:00
701282d2b0
Merge pull request #10889 from PsiOmegaDelta/150826-AdjacentStripping
...
Must now be adjacent to mobs you are stripping.
2015-08-27 06:51:54 +09:30
f16be46a56
Makes moderate virus events one-shot
2015-08-26 14:39:29 -04:00
df3eeb891e
Fixes dead people blocking stuff with shields.
2015-08-26 11:51:04 -04:00
d9e940c3a6
Dish Incubator Limits
...
Imposes limits on the Dish Incubator, it shall no longer have values above the meters on the display.
2015-08-26 17:12:30 +02:00
e152ebcd14
Thrown objects continue flying if reactive teleport armour is triggered.
2015-08-26 10:40:37 -04:00
fb6b94de87
Incorporates laser reflection into the shield system
2015-08-26 10:39:54 -04:00
0a751322e3
Rewrites shield handling
...
Rewrites shield handling to be less hardcoded.
Shields now take into account the damage source and direction when blocking.
Riot shields no longer block most bullets, but are better at blocking melee and thrown items than they were previously.
Energy shields block projectiles with a similar probability as they did before, and block melee and thrown as well as riot shields do.
Shields no longer block from directly behind the player.
Weapons now only block melee attacks.
Cool effects when blocking with an energy shield or energy sword (including holoswords).
2015-08-26 10:39:31 -04:00
89629b686f
Dish Incubator
...
Now the Incubator should stop magically conjuring food whenever there is a beaker without food inside.
2015-08-26 16:18:36 +02:00
85f32efa7a
Players can now select their own language shortcut keys.
2015-08-26 15:15:54 +02:00
798b060254
Fixes bug with hivemind languages being broken for non-observers.
...
Also includes some formatting improvements.
2015-08-26 13:55:16 +02:00
5962656c1e
Languages now use alternative prefix keys.
...
Makes radio and language key overlaps possible.
It is possible to configure the default language keys server side.
Pending: The possibility for players to configure their own language keys.
2015-08-26 13:17:57 +02:00
9c5aba72f0
Must now be adjacent to mobs you are stripping.
...
Fixes #10884 .
2015-08-26 08:12:02 +02:00
3cf542e5f1
Merge pull request #10869 from Techhead0/dev
...
RIG boots may now be worn over shoes.
2015-08-26 07:32:33 +09:30
6fa45cfaa9
Adds if(check_slot) check.
2015-08-25 16:39:54 -04:00
a6604b2ca2
Merge pull request #10830 from mwerezak/lighting
...
Fixes #10465 , escape pod lighting and raider spaceacillin
2015-08-26 05:50:37 +09:30
5197178d2b
Merge pull request #10878 from PsiOmegaDelta/150825-SpecialMsay
...
Restores special admin color in Msay
2015-08-26 05:50:14 +09:30
PsiOmegaDelta