Commit Graph

3020 Commits

Author SHA1 Message Date
Chinsky
ab727aef11 Added link to examine shown item.
Removed grab handler because it's an abstract item.
2013-12-25 02:44:42 +04:00
Chinsky
ddcc5386eb Adds verb similar to ID showing capability for quick showing item in active hand. 2013-12-24 09:49:23 +04:00
Chinsky
0074452f29 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2013-12-03 19:42:17 +04:00
Ccomp5950
624068cc4f Emergency Insertion - Supermatter Manual.
/obj/item/weapon/book/manual/supermatter_engine
2013-12-01 19:31:25 -06:00
Chinsky
027b0d8ec6 Merge branch 'master' into dev-freeze
Conflicts:
	html/changelog.html
2013-11-30 05:16:49 +04:00
Chinsky
5b168c8e4b Merge branch 'dev-freeze' into dev
Conflicts:
	icons/obj/ammo.dmi
2013-11-30 05:15:22 +04:00
Chinsky
5d3e712d64 Merge branch 'master' into dev-freeze
Conflicts:
	html/changelog.html
2013-11-30 05:11:36 +04:00
Chinsky
b4baf60414 Merge pull request #3989 from Ccomp5950/syndicate_id_fix
Hotfix for Syndicate ID's not being able to be assigned names / job
2013-11-29 17:05:16 -08:00
Ccomp5950
675f46fb80 Oops, Typo. What a difference that exclamation point can make. 2013-11-29 15:26:45 -06:00
Ccomp5950
05492cc921 Created a check to see if there is a registered user of the syndicate card,
if there isn't it assignes the first person who tries to change their name with it as the registered user.
2013-11-29 15:07:39 -06:00
Ccomp5950
287860b377 Force name update on new() of syndicate ID cards
Will make sure there is no null names making players unclickable as well as making syndicate cards work
2013-11-28 20:52:38 -06:00
Ccomp5950
497c111796 Bugfix: Hyposprays now fit in medical belts.
Problem:  Person fixing bug #2006 was a bit too specific about type of autoinjectors able to fit in belt.

Solution:  Be less specific.  Now hyposprays fit in belts.
2013-11-28 19:25:43 -06:00
Ccomp5950
1f76f4cfd0 Hotfix for Syndicate ID's not being able to be assigned names / occupations. 2013-11-28 18:43:46 -06:00
Chinsky
83d1924b83 Commiting SueTheCake's detective things.
-New set of clothes spawning in the closet.
-Replacement of revolver by semiauto gun, with update to autolathe recipies.
2013-11-27 04:10:06 +04:00
Mloc
503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm
2013-11-24 23:37:09 +00:00
Nanai
a8f1ee6c91 Girder health/laserkill fix
Allows girders to be broken by repeated laser shots to stop abuse against laserfire. Also, for actually being able to lase through walls if they're open.

Resolves issue #3796
2013-11-23 18:50:15 -05:00
Jeremy Liberman
7e22046b1e Add Cash Bag. Works like Plant Bag but for cash/coins 2013-11-23 17:22:01 -06:00
Zuhayr
185c83b287 Fixes #3642 2013-11-24 09:22:50 +10:30
Nanai
5484163efe Implant mode changability, explosive variable fix
Fixed and upgraded as per Ravensdale's request in #3966
2013-11-23 06:55:12 -05:00
Zuhayr
bfc5a61da1 Fixes #3966 2013-11-23 20:33:58 +10:30
Zuhayr
f359919623 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-11-23 13:21:11 +10:30
Ccomp5950
bcbf02e809 Changed admin message to use the proc that formats for easy Admin-PM of the baddie.
Thanks Kilakk for pointing it out.
2013-11-22 18:36:20 -06:00
Zuhayr
b2ca9f9ccb Added icon_override var to obj/item. When worn, items with icon_override set will use this DMI instead of the hardcoded clothing DMI to determine on-mob sprite. 2013-11-22 22:51:55 +10:30
Zuhayr
ae0605db42 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-11-22 22:18:44 +10:30
Ccomp5950
3ae79d1e91 Admin request: Added admin logging to Detomatix cartridge explosions instead of just admin_messages. 2013-11-21 18:37:23 -06:00
Chinsky
c50c401a85 Walking on tile makes it dirty. Takes 40 times for mob to enter tile for dirt overlay to appear.
Mopping resets dirtiness level.
2013-11-21 13:46:16 +04:00
Ccomp5950
7d545437a3 Spelling mistake.
Commit_Count++
2013-11-20 17:49:11 -06:00
Ccomp5950
d1ca50f384 Bugfix: Yeah variables are case sensitive.
Lesson learned:  Always compile before commit, unless attempting to pad your commit count.
2013-11-20 17:24:39 -06:00
Ccomp5950
34fb26a649 Ravensdale request:
Detomax cartridge use will not create an admin message saying the name/key of the antag that tried to blow up the target, and if it was successful or not.
2013-11-20 17:11:21 -06:00
Iamgoofball
06719b5aa9 added a fuck ton of small changes 2013-11-19 23:00:07 -08:00
Nanai
160e0f9ee8 Poultice potency, bugfixes
Herbal poultice effectiveness now scales with potency of base herb.
2013-11-14 15:21:29 -05:00
Nanai
7ce2314c11 Merge Fixes
Fixes issues post merge and and with minor sanity checks and neatness.
2013-11-14 13:08:40 -05:00
Nanai
ae31f9cdcf Surgery Update
Proper repair surgery for internal organs- Scalpel replaced by membranes from advanced kits, robotic hearts have a separate surgery.
2013-11-14 13:08:31 -05:00
Nanai
cba1a9585d Medical Hoopery
Added eyes as an internal organ, removed the eye-stat var on mobs and changed it to properly direct it to eye damage. Altered all reference.

Updated the sleeper to allow for ejection of the beakers and occupants in panel.

Updated the body scanner to check for prosthetics/mechanized organs, and inform the individual of the blind disability.

Laid the groundwork for mechanical and assisted internal organs.

Groundwork for chemical: Peridaxon, a chemical that allows for the slow regeneration from organ damage.
2013-11-14 12:40:30 -05:00
Mloc-Argent
e6b44d0f35 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2013-11-14 12:03:59 +00:00
Chinsky
8696d4fbd9 No nullname ID cards 2013-11-12 02:10:01 +03:00
DJSnapshot
7665a1a00e Merge pull request #3895 from Baystation12/master
Merge Dev with Master
2013-11-07 16:31:43 -08:00
Chinsky
b7edb181ed Where can I get my idiot certificate. 2013-11-05 03:59:39 +04:00
Chinsky
65c248cda0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into miasma 2013-11-05 02:57:40 +04:00
Chinsky
fd928d4b5f Cleaned the fuck out of smoke. 2013-11-05 02:57:23 +04:00
Chinsky
98ba7e4699 Fixes zombie goast tableflips 2013-11-04 22:36:22 +04:00
Mloc-Argent
f1b230edc4 Merge branch 'master' into dev 2013-11-04 10:46:13 +00:00
DJSnapshot
63fb3f29ea mecha fixes 2013-11-02 12:26:34 -07:00
DJSnapshot
69389d392c Fix for https://github.com/Baystation12/Baystation12/issues/3813 2013-11-02 11:45:26 -07:00
Iamgoofball
989c8b69c5 Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
2013-11-02 11:36:14 -07:00
Iamgoofball
74b5a003cc Fixed Copypasta!
Fixed Copypasta!
2013-11-02 11:17:17 -07:00
Iamgoofball
a75492d26b Startoad's plasma windows commit, I'm doing the github stuff for it.
3677121b51
2013-11-01 18:53:45 -07:00
Cael Aislinn
a4e5bad409 fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-10-29 05:10:17 +10:00
Nanai
adc563db05 Added in two new manuals by Magmaram for atmospherics and EVA. 2013-10-27 18:24:30 -04:00
Nanai
88ef9a3be2 Fixed the absent/removed sprite on experimental welding tools. 2013-10-27 18:24:04 -04:00