Commit Graph

462 Commits

Author SHA1 Message Date
Jarcolr
0030ca76af Spans instead of fonts.
Hopefully no typos.
2015-04-17 15:34:37 +03:00
Jarcolr
9fda2a2614 Fixes #8633
Hopefully the wording is okay. Targeting dev because this file is ahead on master.
2015-04-16 17:27:57 +03:00
=
601e6fb7ef Merged with dev. 2015-03-31 11:17:13 +10:30
=
d77010221c Merge with dev. 2015-03-30 08:36:52 +10:30
PsiOmega
1a000b0e0f Merge remote-tracking branch 'upstream/dev' into NarsiePort
Conflicts:
	code/modules/mob/living/carbon/human/say.dm
2015-03-29 13:04:53 +02:00
PsiOmega
464d702d4b Mob refactoring.
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
2015-03-29 10:44:31 +02:00
Zuhayr
8f242740a8 Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs. 2015-03-28 11:01:11 +10:30
Zuhayr
b9072baa97 Merge with dev. 2015-03-24 14:41:07 +10:30
volas
f8822626bb sanitize() refactor: second pass(other sanitize functions) 2015-03-23 01:38:09 +03:00
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
mwerezak
3de6374b4a Allows unconscious/dead exosuit pilots to be removed if maintenance protocols are enabled.
Enable maintenance protocols -> wrench -> crowbar -> multitool.
2015-03-10 02:47:54 -04:00
mwerezak
2fcf8d51f4 Allows exosuits to interface with adjacent airlock controllers and buttons. 2015-02-21 20:54:01 -05:00
PsiOmegaDelta
4e785f716a Merge pull request #8160 from mwerezak/stools
Replaces stool structures with stool items
2015-02-18 07:35:54 +01:00
mwerezak
57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -05:00
mwerezak
c804d818fd Fixes rocket launcher icon
Also makes the missiles a little bit less of a joke.
2015-02-16 22:59:35 -05:00
mwerezak
cd81f0b706 Improves gun scope zooming 2015-02-14 22:12:16 -05:00
mwerezak
ea39f7f718 Cleanup can_fire(), projectile flag
Removes can_fire() and moves some of it's functionality into
get_next_projectile(), which was renamed to consume_next_projectile() to
indicate the possibility of side-effects.
Also renamed flag var to check_armour
2015-02-12 01:37:19 -05:00
unknown
39b467c9da New bullet types, projectile rewrite
* Refactors projectile Bump()
* Converts projectile_type var strings to paths
* Reorganizes bullet projectile paths
* Made a pass through all the bullet_act() definitions. Mainly ensured that damage_type is checked when dealing damage to certain objects. Removed stupid /turf bullet_act() override, replaced with on_hit() overrides on the relevant projectiles.

* Adds shotgun pellets projectile. Adds Raptor's shotgun slug sprite.
* Gives stunshots more of their own identity, refluffs them as taser cartridges for shotguns. They still aren't obtainable anywhere unless spawned.
* Makes projectiles pass through girders and cultgirders with a certain probability, unless the girder itself was clicked.
* Projectiles are also able to pass through grilles. Low damage projectiles have a chance to be blocked by grilles. High damage projectiles have a chance to have some damage absorbed by the grille.
* Makes projectiles for blanks invisible.
* Adds flash bullet types
* Adds support for 'penetrating' projectiles
* Swaps .45 and 9mm projectile types. .45s hit slightly harder, 9mils have more ammo capacity.
2015-02-06 20:09:32 -05:00
Chinsky
b995c856a9 Merge pull request #7924 from Kelenius/ofTablesAndPass
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
PsiOmegaDelta
2a516ed80a Merge pull request #7959 from mwerezak/hoverpod
Returns hoverpod step drain to 10
2015-01-27 16:34:13 +01:00
mwerezak
f80f8f3057 Returns hoverpod step drain to 10 2015-01-27 01:05:10 -05:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
Zuhayr
cb88860f6b Merge resolution. 2015-01-07 03:43:12 +10:30
mkalash
6e8d2c55b0 Adds stack amount check when loading materials into the exosuit fabricator. Fixes #7665 2015-01-04 21:34:50 -05:00
mkalash
6d9c2671b9 Copies extinguisher code to exosuit extinguisher, fixes #7603 2015-01-04 00:43:19 -05:00
Zuhayr
261f3f935c Fixes #7627 2015-01-02 19:19:01 +10:30
Mloc
5895615f72 Merge pull request #7377 from Amunak/ref
Research and circuit boards refactoring and improvements. Explosive can no longer be planted on webbing. Also some other stuff.
2014-12-18 22:29:35 +00:00
Mloc
66cb91d281 Merge pull request #7280 from Neerti/12_7_14_holopad_and_emotes
Adds see_emote(), other cool things.
2014-12-18 22:10:54 +00:00
Amunak
c53d14d80c Weapon type design datums will now get proper description.
Also fixes two names I forgot to fix before.
2014-12-18 05:28:41 +01:00
Amunak
d28cb57f79 Merges upstream/dev to ref, resolves merge conflicts 2014-12-18 03:44:28 +01:00
Amunak
42bdf427b8 Properly decapitalized mecha equipment. 2014-12-17 19:10:31 +01:00
Amunak
1a972974bc Moves all circuitboards to their respective files.
Computer boards are now in /code/game/objects/items/weapons/circuitboards/computer/.
Buildable machinery boards are in /code/game/objects/items/weapons/circuitboards/machinery/.
Everything else is just in /code/game/objects/items/weapons/circuitboards/.
The circuitboard parent definition is in /code/game/objects/items/weapons/circuitboards/circuitboard.dm.
Did some minor renaming and capitalization fixes on the boards.
2014-12-17 14:31:21 +01:00
Ccomp5950
20e6b4ca01 Merge pull request #7395 from atlantiscze/nanostuff
NanoUIs
2014-12-16 21:11:55 -05:00
Amunak
9cf4de5faa Removes redundant item info from circuitboard/mecha.
Also fixes capitalization.
2014-12-13 07:44:31 +01:00
Atlantiscze
836c5038db Adjusts size of previous UI 2014-12-11 09:49:55 +01:00
Segrain
b1785edf33 Fix for #7365. 2014-12-11 05:01:47 +03:00
Amunak
1e769b4314 Attempt to normalize computer and circuit board names and their research names.
Also moved RCON console board and SMES board where they belong. Formatted some board code and fixed some typos, too.

Cloning console renamed to Cloning Control Console.
The teleporter console is now called Teleporter Control Console.
The power monitor is now called Power Monitoring Console.
SMES board glass and acid construction price normalized (though other resources are still required; is that a good thing? It would be better to just introduce a new expensive part that is used to build it (if the coils aren't enough) rather than have a single board with atypical price.
2014-12-10 20:37:18 +01:00
Atlantiscze
0bacf5492e Final version of Mech Bay Charging Console NanoUI implementation 2014-12-10 15:19:53 +01:00
Atlantiscze
1a6d1eac2f Compile error fix 2014-12-10 12:42:57 +01:00
Atlantiscze
73b04ff177 Compile error fix 2014-12-10 12:34:23 +01:00
Atlantiscze
43e816895d v1.0 of NanoUI for mech bay consoles. 2014-12-10 12:32:27 +01:00
Neerti
c90e9eb931 More merge conflict resolution goodness. 2014-12-10 02:14:58 -05:00
PsiOmega
924955a4c8 Merge remote-tracking branch 'upstream/master' into dev-freeze 2014-12-09 09:07:38 +01:00
Segrain
a311da90fb Fix for #7330. 2014-12-09 07:39:38 +03:00
Neerti
dc0f342b0b I left my debug stuff in. 2014-12-08 20:20:39 -05:00
Neerti
e1babe281a Fixes AI cards/mechs, with least bad method. 2014-12-08 20:14:55 -05:00
Neerti
9e9c297b2e Begins work,
Holopads can receive and send emotes.
The AI, when using 'me', will check if a holopad is being used.  If so, the holopad will output the emote.  If not, it's outputted from the core.
The AI will hear emotes from near an active holopad.
There is a new obj verb called 'see_emote()', that works similarly to hear_talk().
custom_emote() modified to have 'seeing_obj' list.  May be resource-intensive, not sure.
pAIs can now hear emotes, without issue.
Carded AIs can hear emotes, but they hear themselves twice.
Mechs do not hear emotes correctly at this time.
2014-12-07 23:03:42 -05:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
PsiOmega
5b8942543b Merge remote-tracking branch 'upstream/dev' into RoboCircuit 2014-11-27 08:58:34 +01:00
PsiOmega
c14411d979 Robots can now be rebuilt after destruction.
Robotic borgs now have a circuit which can be re-installed in a new chassi after the destruction of the original.
2014-11-27 08:58:29 +01:00