Commit Graph

458 Commits

Author SHA1 Message Date
Segrain
4b7b910311 Fix for #7324. 2014-12-09 09:39:05 +03:00
RavingManiac
782e9f520d Changed the wording of the sniper rifle/binoculars zoom messages.
Updated changelog.
2014-10-22 02:19:38 +08:00
mwerezak
b8cfe87ca2 Fixes #6783, moves spacesuits to a separate file
Adds an update_clothing_icon() proc to clothing items that will call the
relevant icon update proc on the mob which is equipping the clothing, if
any. Changes various clothing procs to not call update icon procs on usr
which may not even be the mob wearing the clothing.
2014-10-18 22:12:15 -04:00
Zuhayr
77917fb2c4 Merge pull request #6584 from Iamgoofball/patch-6
quick fix for #6498
2014-10-05 10:10:50 +10:30
RavingManiac
756e9ae030 Zooming with an item is now done with a general proc zoom(). This applies to binoculars and sniper rifle. 2014-10-04 17:38:38 +08:00
RavingManiac
f0da0380a5 Sniper rifle zoom now adds a client.pixel_x/y offset in addition to zoom. Currently 11 tiles in the direction the user is facing. Zooming can now be done through the right-click menu.
Binoculars added. Functionally similar to sniper scope. Adminspawn-only as of this commit.
2014-10-04 04:01:56 +08:00
Iamgoofball
a5dacfc5bd Update boxes.dm 2014-10-02 16:35:44 -07:00
Zuhayr
223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Kelenius
505f857eb8 Stack update 2014-09-02 09:59:32 +04:00
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
mwerezak
bd397ff844 Adjusts laser cannon damage
Increased laser cannon damage to be higher than regular laser damage.
Also updated the name var of /laser/captain so that it doesn't inherit
"laser carbine"
2014-08-16 22:34:23 -04:00
mwerezak
d399fb610d Renames "laser gun" to "laser carbine" 2014-08-14 22:59:18 -04:00
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
mwerezak
a6c31bc5e8 Fixes xbow tension not being rest when fired 2014-08-07 17:06:01 -04:00
Zuhayr
f8e50b28f5 Bevy of newhydro fixes. 2014-07-29 00:20:38 +09:30
Zuhayr
efe1c2feb2 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-26 15:39:25 +09:30
DJSnapshot
de282a4e2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/client/preferences.dm
2014-07-25 17:19:59 -07:00
Zuhayr
5da36d265e Merge resolution with PDA nanoui. 2014-07-25 22:57:53 +09:30
Zuhayr
57b790ad92 Merging. 2014-07-25 22:50:35 +09:30
DJSnapshot
bb336b7691 temporary fix for #4907 2014-07-23 21:48:32 -07:00
DJSnapshot
f8d478fcbb Updates to gun targeting UI. Fixes #5710 2014-07-23 20:51:58 -07:00
Zuhayr
d02e370830 Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites. 2014-07-21 19:02:38 +09:30
mwerezak
ad211b19f7 Tweaks shotgun beanbag rounds
Makes them more comparable to the shotgun stunshot.
2014-07-18 16:03:54 -04:00
Zuhayr
3976433396 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 20:57:06 +09:30
Zuhayr
f4ff51f146 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:32:00 +09:30
Zuhayr
f795712a95 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:30:41 +09:30
mwerezak
f2845dbe76 Thrown items can be targeted, has miss chance...
...based on distance, similar to projectiles.
2014-07-15 01:14:04 -04:00
Kelenius
aad89409de Slime update 2014-07-13 17:37:30 +04:00
SparklySheep
83ec2c5d80 Readjusted agony of weakbullet. 2014-07-12 12:06:43 -05:00
SparklySheep
acb5dfbbe3 Detective Revolver nerf. Uses agony instead of...
stun and weaken. Also changed the shotgun's stunshot to be a very powerful agony based shotgun shell. Beanbags are not for combat, stunshots are.
2014-07-12 11:50:16 -05:00
Zuhayr
48f02db5a0 Fixed some icon issues with vox/adjusted paths, fixed icon issue with armalis cannon. 2014-06-29 10:00:35 +09:30
Chinsky
be95e54e43 Merge branch 'master' into dev
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
2014-06-17 16:16:44 +04:00
mwerezak
6dee9cf65d Adds sharp and edge flags to appropriate items
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
2014-06-16 13:26:44 -04:00
mwerezak
9f594e4755 Bullets are now properly sharp 2014-06-15 20:28:34 -04:00
mwerezak
1b33ca943d Separates the sharp flag into edge and sharp
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.
2014-06-15 20:25:39 -04:00
Zuhayr
9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
Zuhayr
a528a4db1f Split vox and vox armalis icons up into their own files. Set up species-level sprite files for vox and vox armalis. Removed icons/mob/vox.dmi. 2014-05-15 14:46:27 +09:30
Zuhayr
429684d5ac Squashed armalis/vox commits and human icon update commits:
Armalis gear and mob icons, plus sonic cannon.
Added sonic cannon skeleton code.
Noise cannon fire sound, Vox shriek sound.
Added Vox Armalis species.
Swapped vox breath mask over to species_restricted check.
Added Vox Armalis gear.
Added a random shriek effect to Vox and Vox Armalis speech.
Added quickspawn Vox Armalis definition.
Vox shriek sound effect. Thought I committed this earlier.
Added r_hand and l_hand icon_overwrite checks.
More work on Armalis. Added gut() and leap() human procs.
Adding/fixing up the leap() and gut() verbs, and a LEAPING status_flag for human/Bump().
Fixing some missing pixels in the armalis tail.
Almost forgot to whitelist armalis...
2014-05-15 14:30:37 +09:30
Mloc-Hibernia
f2924c9f57 Merge remote-tracking branch 'upstream/dev' into bs12-zuhweapons 2014-05-11 13:48:51 +00:00
Mloc-Hibernia
e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
2014-05-11 13:19:09 +00:00
Zuhayr
5e682668b2 Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable. 2014-05-10 02:10:06 +09:30
Zuhayr
1dc85149ce Fixes #4716 2014-05-10 00:33:09 +09:30
Mloc-Argent
e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-05-03 16:56:19 +01:00
Mloc
3e7ac27061 Merge pull request #4868 from valzargaming/master
Fixes gum.dm firerate
2014-05-02 10:12:15 +01:00
valzargaming
5b289f53c5 Fixes gum.dm firerate
Firerate will now properly report to the player what their firemode is set to.
2014-04-30 18:23:42 -05:00
Chinsky
690be8e830 Merge pull request #4863 from mwerezak/shotgun-pump
Fixes #4856
2014-05-01 03:13:23 +04:00
Mike
f3b0ee8a43 Fixes #4856
Shotgun pumping not playing
2014-04-30 10:38:30 -04:00
Ccomp5950
976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
2014-04-25 21:14:58 -05:00
Ccomp5950
b2d03d67a0 Merge pull request #4819 from Mloc/bs12-itemorgans
human: move organ generation into a species proc
2014-04-25 15:33:34 -05:00
Mloc-Argent
28a57a1029 human: move organ generation into a species proc
New proc: /datum/species/create_organs
Called in set_species when no organs exist or it's forced.
Also shuffled set_species around a bit, adding a var to human/new to
specify a species to start as.
Should fix the adminspawn vox organ runtime.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-04-18 10:44:21 +01:00