f0b02d8035
Cleans up auto-hiss, makes declaring new auto-hiss strings a simple list declaration
2015-09-02 19:07:20 +01:00
593922929b
Changelog entry.
2015-09-02 16:54:54 +02:00
a7c527f491
Compilation fixes.
2015-09-02 15:14:24 +02:00
affff253bc
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/modules/mob/living/living.dm
code/modules/mob/mob_grab.dm
2015-09-02 14:58:13 +02:00
d78db0231b
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-09-02 14:42:27 +02:00
13780eba09
Rotates and otherwise cleans up map intercom usage.
2015-09-02 14:26:59 +02:00
1b23f794c5
Merge remote-tracking branch 'upstream/dev' into 150822-Intercoms
2015-09-02 10:54:04 +02:00
2a02f4890c
Merge pull request #10336 from atlantiscze/phoronwindowsv2
...
Borosilicate windows
2015-09-02 16:11:39 +09:30
0f76c59944
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into technoir
...
Conflicts:
icons/mob/head.dmi
2015-09-02 04:50:00 +03:00
a3b3e52959
Merge branch 'dev' of https://github.com/comma/Baystation12 into technoir
2015-09-02 04:38:26 +03:00
a6cdeee95c
Add autohiss/purr on a per-client toggle
2015-09-01 23:37:56 +01:00
6e2514d728
Beepsky should no longer attempt to arrest himself.
...
Adds additional threat check.
2015-09-01 18:25:51 +02:00
03f5254850
Restores suit rolling verb.
2015-09-01 13:50:38 +03:00
667debfb3c
Merge pull request #10745 from mwerezak/mob-grab
...
Cleans up mob_grab.dm
2015-09-01 12:58:50 +03:00
cf0a3f94d0
Merge pull request #10808 from Hubblenaut/dev
...
Bar drinks
2015-09-01 12:56:54 +03:00
28cf860332
Adds revolver spin sound.
2015-09-01 12:18:49 +03:00
1362271e60
Added short-sightedness for species, added groundwork for variant species sight flags.
2015-09-01 11:42:33 +09:30
bd76f977da
Added a complex holder for human mobs + example icons (for an unadded species)
2015-09-01 11:39:22 +09:30
3f6f34c16f
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/mob/holder.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/carbon/human/species/station/station.dm
icons/mob/head.dmi
2015-09-01 11:22:10 +09:30
7581717246
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
maps/exodus-1.dmm
2015-09-01 10:55:19 +09:30
e0a70d24ba
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2
2015-09-01 03:22:08 +02:00
2d4c56a41e
Merge pull request #10940 from Zuhayr/dev
...
Limbs now copy hair data from their owner and may have optional body hair icons blended into them.
2015-08-31 20:57:40 +01:00
a7ff1a09ee
Adds Supply Fax
...
Quartermaster now has fax access and a fax machine. Fax machines have a
third admin channel, "Supply" for special requests like three thousand
mankinis or a Phazon, up to the admins to accept or deny requests, and
deduct cargo points if they'd like to.
2015-08-31 15:32:35 -04:00
7f97527471
Merge pull request #10581 from Kelenius/ofMechfabAndPanic
...
Updates mechfab
2015-08-31 17:39:04 +09:30
57ab846273
Merge branch 'dev' into ofMechfabAndPanic
...
Conflicts:
maps/exodus-1.dmm
2015-08-31 10:57:04 +03:00
9f54a71c2c
Limbs now copy hair data from their owner and may have optional body hair icons blended into them.
2015-08-31 16:34:13 +09:30
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
GinjaNinja32