Arokha Sieyes
1e9e55d73d
Moves static overlay to be a global HUD option
2016-06-11 21:53:30 -04:00
Leshana
e004a8bfc0
Merge remote-tracking branch 'polaris/master' into sink
...
# Conflicts:
# code/_onclick/item_attack.dm
# code/modules/client/preferences.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/simple_animal/hostile/hostile.dm
# code/modules/mob/new_player/preferences_setup.dm
# nano/images/nanomap_z1.png
# vorestation.dme
2016-05-29 16:22:07 -04:00
EmperorJon
5a545854a4
Underwear Datums ( #1794 )
...
* One more step to bringing our preferences/setup stuff in line with Bay.
* Whoopsy
* Jon is a moron, more at 11.
2016-05-29 17:29:36 +01:00
Yoshax
cd9fdd228b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall
2016-05-28 20:22:09 +01:00
Arokha Sieyes
8230732453
Merge branch 'sync' of https://github.com/VOREStation/Polaris into 05192016_sync
2016-05-19 23:52:00 -04:00
Arokha Sieyes
82dc0dc5ac
Fixes #1654
...
Comrade, if you speel monitor as monitort then you not need to monitor.
2016-05-19 11:57:01 -04:00
Arokha Sieyes
17a64bebea
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into breakfix
...
# Conflicts:
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/new_player/new_player.dm
# vorestation.dme
2016-05-12 13:02:51 -04:00
Arokha Sieyes
807bfc8888
Basic Vore Implementation for #1 ( #25 )
...
* Basic Vore Implementation for #1
Adds vore sounds, bellies, vore procs, all types of vore except
macro/micro as that is not implemented yet. Also adds a few type2type
methods and a text method that we had before.
* Ending linebreaks
* More crlf
* Globalize two lists
* Removed interface type
2016-05-07 23:51:53 -04:00
Zuhayr
6edb8b31f3
Made slimes more interesting.
2016-05-06 04:07:52 +09:30
Neerti
3ea6635f6a
Fixes two very common runtimes
...
Fixes some null.Topic() runtimes caused by AI hotkeys.
removeItem() now checks if the item actually exists before modifying variables.
2016-05-02 00:46:31 -04:00
EmperorJon
50ac115d68
Merge pull request #1524 from SinTwo/minimalist-ui
...
Allows robots to change UI style.
2016-05-01 16:34:28 +01:00
SinTwo
cc3dca6cb1
Allows robots to change UI style.
2016-04-29 22:40:27 -04:00
Kelenius
a86c1616bf
Removes move delay after clicking
2016-04-25 11:36:48 +03:00
mwerezak
4951790b50
Fixes missing cooldowns, missing cult blade sound.
...
Conflicts:
code/game/objects/items/weapons/material/kitchen.dm
2016-04-22 04:58:25 -04:00
mwerezak
deb215d262
Refactors bottle smashing, apply_hit_effect() now returns the blocked status.
...
Conflicts:
code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
code/modules/mob/living/simple_animal/simple_animal.dm
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2016-04-22 04:57:23 -04:00
mwerezak
d4cbc49132
Prevents attacking yourself with items unless on harm intent
2016-04-22 04:57:22 -04:00
mwerezak
3c22e65399
Adds some documentation to item_attack.dm
2016-04-22 04:57:22 -04:00
mwerezak
11c5b10bb9
Refactors various item attack() implementations
...
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.
Conflicts:
code/game/objects/items/weapons/clown_items.dm
code/game/objects/items/weapons/material/kitchen.dm
code/game/objects/items/weapons/stunbaton.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2016-04-22 04:57:22 -04:00
mwerezak
593f7699db
Refactors item_attack.dm
...
Refactors and cleans up item_attack.dm and related mob attack code
Conflicts:
code/_onclick/item_attack.dm
code/game/objects/items.dm
code/modules/mob/living/bot/bot.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2016-04-22 04:52:04 -04:00
EmperorJon
9201240f33
Merge pull request #1446 from Yoshax/followfix
...
Adjusts check to fix double click moving as observer
2016-04-20 13:22:46 +01:00
Yoshax
e6392ee5d1
Adjusts check to fix double click moving as observer
2016-04-19 18:08:08 +01:00
HarpyEagle
38ffd7306b
Adds click cooldowns for attacking non-mob atoms for various mob types
2016-04-18 15:23:22 +01:00
Neerti
da53a9ea60
Aim Intent Changes
...
Manually ports https://github.com/Baystation12/Baystation12/pull/12614 's fix to not make examining trigger the autofire.
The toggle to shoot if the target talks on the radio defaults to off.
The aim intent icon now updates when clicked.
2016-04-16 02:30:47 -04:00
EmperorJon
1555ff98e1
Merge pull request #1384 from Datraen/DarkClick
...
Manually ports /tg/'s darkclick code.
2016-04-09 15:57:23 +01:00
Datraen
9c21e0bcdc
Manually ports /tg/'s darkclick code.
...
https://github.com/tgstation/-tg-station/pull/10272 by Razharas.
2016-04-08 23:07:10 -04:00
PsiOmegaDelta
52ecd6dbe1
Ghosts can now follow any /atom/movable object.
2016-04-07 19:26:57 +01:00
Neerti
a9ad84da4b
Merge pull request #1191 from Kelenius/inventoryCleanup
...
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
Datraen
996ce92f7f
Merge pull request #1184 from Yoshax/510prep
...
Ports Byond 510 preperations from Bay
2016-03-20 13:45:40 -04:00
Datraen
fe9d3fd4c4
Merge pull request #1027 from Kelenius/mobCleanup
...
Changes types of ghosts and eyes
2016-03-18 13:50:47 -04:00
Neerti
07eeb16a2e
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard
2016-03-15 10:17:31 -04:00
Kelenius
afbc235b96
Mob inventory cleanup
2016-03-15 16:39:40 +03:00
Yoshax
8be10d96dd
Ports Byond 510 preperations from Bay
...
Updates comment
Updates supply file
2016-03-14 18:21:44 +00:00
Datraen
1b40fb3bfe
Traitor Borg lockdown, blowing-up fixed; can now self-hack.
2016-03-12 17:03:28 -05:00
Yoshax
b2916bbb56
Splits underwear into top and bottom
2016-03-11 19:26:50 +00:00
Kelenius
b9a9a7eb88
Merge branch 'master' into botFixes
2016-03-01 14:48:24 +03:00
Neerti
23b15390dd
Merge pull request #893 from Kelenius/AIHud
...
AI hud
2016-02-26 20:31:40 -05:00
Kelenius
acc78a8000
Changes types of ghosts and eyes
...
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``
Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
2016-02-20 15:36:05 +03:00
Neerti
b7a3a98ef0
Ling nerfs, ear protection cleanup, and ling bugfixes.
2016-02-14 19:58:57 -05:00
Neerti
be43fd1d9e
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard
2016-02-07 22:15:36 -05:00
Zuhayr
7c3993b68b
Revert "Revert "Bay update.""
2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c
Revert "Bay update."
2016-02-07 16:07:05 +10:30
Neerti
f2cd67fe16
Merge pull request #810 from Zuhayr/bayupdate
...
Bay update.
2016-02-05 23:21:07 -05:00
Kelenius
906b03e736
Gives AI the hud, sorts the verbs
...
Removes 'AI IM' category
Adds 'AI settings' category
Unnecessary verbs are hidden by default but can be shown/hidden again by
using a verb
2016-02-05 17:21:04 +03:00
Neerti
a90d2c1a50
Continues working on newwizard.
2016-02-04 01:19:19 -05:00
Kelenius
cf244e07d6
Mulebots are now mobs
...
obj/machinery/bot removed completely
Mulebot hacking removed, you can still disable their safety.
Mulebot PAD interface redone.
2016-02-02 17:51:50 +03:00
Kelenius
c9c9dde819
Removes old unticked code
2016-02-01 12:47:20 +03:00
Zuhayr
d5b904ca2a
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
2016-01-26 11:11:55 +10:30
Datraen
28e48e1c6a
Fixes #828
2016-01-23 22:51:04 -05:00
Zuhayr
36c0bb0f13
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
2016-01-22 01:33:09 +10:30
Zuhayr
f89948d666
Added functionality for two-handed gun use.
2016-01-21 00:51:54 +10:30
