Zuhayr
d03d9eebca
removing now unneeded limb define.
2015-09-06 00:42:54 +09:30
Zuhayr
34a0c2f080
Added Resomi blood/damage masks.
2015-09-06 00:42:02 +09:30
Zuhayr
2d91711fcc
Tail icons now use tail_hair var for overlays.
2015-09-05 16:07:24 +09:30
Zuhayr
1c2cea708d
Mousedrop runtime fix.
2015-09-05 14:45:57 +09:30
Zuhayr
a41ce0bd93
Added the Resomi.
2015-09-04 08:57:03 +09:30
Zuhayr
cae57f022e
Added by-species hat light overlays.
2015-09-04 08:56:45 +09:30
Zuhayr
0a355c84a3
Added species checks for robolimb use.
2015-09-04 08:55:27 +09:30
Chinsky
94f7538d01
Merge pull request #10934 from PsiOmegaDelta/150822-Intercoms
...
Removes radio free range option, adds out-of range options
2015-09-03 20:47:39 +03:00
PsiOmegaDelta
7bcf9aaea9
Merge pull request #10340 from comma/russian_roulette
...
Russian roulette and russian roulette accessories
2015-09-03 19:40:01 +02:00
Chinsky
72d768808a
Merge pull request #10110 from mwerezak/shields
...
Better shield handling
2015-09-03 20:38:48 +03:00
Chinsky
431db2bdbb
Merge pull request #10970 from Zuhayr/complexholder
...
Added a complex holder for human mobs + example icons
2015-09-03 20:36:17 +03:00
PsiOmegaDelta
ad2e922776
Merge pull request #10971 from Zuhayr/sight
...
Added short-sightedness and sight flags proc.
2015-09-03 17:21:05 +02:00
PsiOmega
e5aa095f09
Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys.
2015-09-03 09:38:15 +02:00
PsiOmega
593922929b
Changelog entry.
2015-09-02 16:54:54 +02:00
PsiOmega
a7c527f491
Compilation fixes.
2015-09-02 15:14:24 +02:00
PsiOmega
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
PsiOmega
d78db0231b
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-09-02 14:42:27 +02:00
PsiOmega
13780eba09
Rotates and otherwise cleans up map intercom usage.
2015-09-02 14:26:59 +02:00
PsiOmega
1b23f794c5
Merge remote-tracking branch 'upstream/dev' into 150822-Intercoms
2015-09-02 10:54:04 +02:00
Zuhayr
2a02f4890c
Merge pull request #10336 from atlantiscze/phoronwindowsv2
...
Borosilicate windows
2015-09-02 16:11:39 +09:30
PsiOmega
6e2514d728
Beepsky should no longer attempt to arrest himself.
...
Adds additional threat check.
2015-09-01 18:25:51 +02:00
Chinsky
667debfb3c
Merge pull request #10745 from mwerezak/mob-grab
...
Cleans up mob_grab.dm
2015-09-01 12:58:50 +03:00
Chinsky
cf0a3f94d0
Merge pull request #10808 from Hubblenaut/dev
...
Bar drinks
2015-09-01 12:56:54 +03:00
Chinsky
28cf860332
Adds revolver spin sound.
2015-09-01 12:18:49 +03:00
Zuhayr
1362271e60
Added short-sightedness for species, added groundwork for variant species sight flags.
2015-09-01 11:42:33 +09:30
Zuhayr
bd76f977da
Added a complex holder for human mobs + example icons (for an unadded species)
2015-09-01 11:39:22 +09:30
Zuhayr
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
Zuhayr
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
Atlantis
e0a70d24ba
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2
2015-09-01 03:22:08 +02:00
GinjaNinja32
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
Raptor1628
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
Zuhayr
7f97527471
Merge pull request #10581 from Kelenius/ofMechfabAndPanic
...
Updates mechfab
2015-08-31 17:39:04 +09:30
Kelenius
57ab846273
Merge branch 'dev' into ofMechfabAndPanic
...
Conflicts:
maps/exodus-1.dmm
2015-08-31 10:57:04 +03:00
Zuhayr
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
PsiOmegaDelta
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
Zuhayr
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
Cael Aislinn
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
Zuhayr
ac04bdfb52
Readded monkey scooping.
...
Conflicts:
code/modules/mob/living/carbon/human/species/species.dm
2015-08-31 07:01:56 +09:30
Datraen
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
PsiOmega
0bd41e604b
Merge remote-tracking branch 'upstream/dev' into Backup
2015-08-30 15:55:10 +02:00
PsiOmega
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
PsiOmegaDelta
88250ad57f
Merge pull request #10939 from Baystation12/master
...
Dev-freeze
2015-08-30 10:20:32 +02:00
Zuhayr
92d3e6d240
Fixes Yongauni#155
2015-08-30 11:45:54 +09:30
Chinsky
bfa54052f8
Merge pull request #10891 from Peliia/Peliia-patch-1
...
Virology Tiny Fixes
2015-08-29 23:27:15 +03:00
Chinsky
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
PsiOmega
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
Zuhayr
dfbdd79375
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev
2015-08-29 16:53:42 +09:30
Zuhayr
7d82e4850e
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2015-08-29 16:53:07 +09:30
Zuhayr
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
mwerezak
db8aefb121
Refactors duplicate parry code
2015-08-28 14:39:28 -04:00
