Commit Graph

7166 Commits

Author SHA1 Message Date
fleure 47a23e1465 Merge pull request #3456 from phil235/TrayPinMsgFix
Fixing rolling pin/tray attack stuff
2014-04-23 14:52:58 +01:00
Cheridan f83f1932b2 Meteor code uses OOP principles a little better now
Adds new types of meteors with different effects.
Meteors drop some ore when they hit.
2014-04-23 01:37:44 -05:00
MrPerson 2841124d29 Runtime fix for the mop
The following runtime has occured 40 time(s).
runtime error: Cannot execute null.clean blood().
proc name: clean (/obj/item/weapon/mop/proc/clean)
  source file: mop.dm,22
  usr: Xavier Paynter (/mob/living/carbon/human)
  src: the mop (/obj/item/weapon/mop)

Cause: Someone would mop the same vomit/whatever more than once. The first clean would qdel() the vomit, which resulted in the vomit's loc being null. The subsequent moppings would continue and eventually try to call vomit.loc.clean_blood().
2014-04-22 12:52:33 -07:00
Cheridan 4d8160ab14 meteorhit() is kill 2014-04-22 12:16:02 -05:00
Cheridan b441e34d14 Merge pull request #3390 from Ikarrus/deptmanagement
Heads may use ID Modification Consoles to manage their department
2014-04-21 22:51:57 -05:00
Cheridan c3a3d00f82 Merge pull request #3470 from Giacom/default_wiki
Changed the default wiki to tgstation13.org/wiki.
2014-04-21 21:56:52 -05:00
Giacomand d42aa1e28a Fixes a typo. 2014-04-21 21:00:23 +01:00
phil235 382397a6ea Fix for #3151
Removes the useless periods.
2014-04-21 19:36:33 +02:00
Cheridan 7c4ea04c36 Merge pull request #3478 from Jordie0608/unfastedagirlwhatdo
Fixed typo in grille fastening
2014-04-21 12:20:49 -05:00
Giacomand 016889bfc0 Fixes transit tubes being stuck, it uses process() instead of a spawn'd loop.
Segmented the transit tube code into its own folder and code files, for each part of the tube.
2014-04-21 15:44:50 +01:00
Aranclanos 169a61b026 Makes fingerprintslast use ckey instead of key
Cleans a bit the prime() code, large grenades won't be a huge copypaste anymore
Asay logs will now show up when the grenade is activated instead of used. Only when The grenade is activated by an assembly.
New proc, get_mob_by_ckey(). Give it a ckey and it will return a mob.
2014-04-21 10:57:56 -03:00
Jordie 10ea2eb771 Fixed typo in grille fastening 2014-04-21 11:21:45 +10:00
Menshin 80e7d1d0e7 Added a check for "_nodrop_" items for several machines/structures (fix #3407). 2014-04-20 20:49:32 +02:00
Giacomand d1b0a76eae Changed the default wiki to tgstation13.org/wiki.
Changed the wiki url format to work with the manuals, you can change the config if there are extra parameters, like title.
Fixed the telescience manual not linking to the telescience guide.
2014-04-20 19:20:33 +01:00
phil235 57bba34352 missed a parenthesis 2014-04-19 21:12:10 +02:00
phil235 7314993d76 Fixing rolling pin/tray attack stuff
* simplify the attack code.
* fix messages and lack of sound when attacking with the rolling pin.
* rolling pin and tray will now use their attack verbs hopefully.
2014-04-19 20:53:45 +02:00
Menshin a2a154aca9 Fixes for (#3441). 2014-04-19 14:02:37 +02:00
Ergovisavi f302adc8ab Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-04-16 16:58:28 -07:00
Cheridan 440039f0a2 Merge pull request #3429 from Giacom/fix_manuals
Fixes manuals being unreadable.
2014-04-16 14:31:52 -05:00
ikarrus 5f5a470fe9 Merge branch 'master' of https://github.com/tgstation/-tg-station into steelpointcleanup
Resolved Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
2014-04-15 21:10:00 -06:00
Cheridan a8c5e2ea24 Merge pull request #3389 from Ikarrus/notifyfix
Fixed AI not being notified of new roboticist-built cyborgs slaved to it
2014-04-15 14:15:43 -05:00
Giacomand 3a6672b639 Fixes manuals being unreadable. 2014-04-15 18:37:48 +01:00
Nnelg caf7d424e6 Trying to fix compilation error.
Changed "M as mob" in arguments list to "mob/M"; I think the former made it look for proc/can_equip() instead of mob/proc/can_equip().


Also, it no longer returns 0 for a null slot parameter.
2014-04-14 17:56:05 -05:00
Nnelg 4283977188 Cut out snowflake mob_can_equip code.
Now it calls mob/proc/can_equip(obj/item/I, slot, disable_warning = 0) instead.

Good-riddance, nasty ugly if(istype(...))!


Future task: update corgi/xeno/whatever code to use this proc, now that it's nice and clean.
2014-04-14 14:35:13 -05:00
ikarrus b800d97e3c Changed execution chamber access to access_hos, removed bolt controls 2014-04-13 13:51:30 -06:00
Cheridan 67fa027afb Missed a message! 2014-04-10 15:39:28 -05:00
Daniel 4b2679264b Removed the separate feet icon
It did nothing anyways
2014-04-10 19:22:04 +02:00
Daniel d8a1dc637f Minor cleanup 2014-04-10 19:19:06 +02:00
Jordie0608 b18cc7d54e Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/mineral_doors.dm
	code/modules/research/protolathe.dm
	icons/obj/doors/door_assembly.dmi
2014-04-11 02:51:07 +10:00
Daniel 9e1b89baa1 Cleaned up and simplified the code. 2014-04-10 17:01:07 +02:00
Daniel 192b1d91a8 Readded argument, cleaned up rollerbed code 2014-04-10 15:43:03 +02:00
Daniel 5f30e1d8ad Removed unneeded argument 2014-04-10 15:35:58 +02:00
Daniel 1e5b817eb1 Added armrest overlay 2014-04-10 15:34:57 +02:00
ikarrus 7213d8575a Heads may use ID Modification Consoles to manage their department
-Heads may modify ID access for their department using ID computers
-Heads may only modify access that they get by default
-Heads may demote IDs if they are able to stip away all access from their card
-Heads may not modify a card's name or title, except when Demoting an ID
2014-04-09 23:58:15 -06:00
ikarrus 13fa889b7f Fixed AI not being notified of new roboticist-built cyborgs slaved to it 2014-04-09 20:55:36 -06:00
Daniel b0b1e5aff7 Added custom colorable sofas 2014-04-09 22:30:45 +02:00
Cheridan 31cfe0ba80 Merge pull request #3378 from Donkie/jobrefactor
Jobcode refactoring TAKE TWO
2014-04-09 13:52:37 -05:00
Cheridan 2b64683a6b Refactors pAI law code to use the inherited laws datum instead of its own specific variables
Removes annoying double-message box when selecting NEVER FOR THIS ROUND.
Span classes
2014-04-09 12:38:22 -05:00
Daniel 30bb6c8814 Generalised ID naming 2014-04-09 18:49:59 +02:00
Daniel 6c668c7c7b Generalised PDA naming 2014-04-09 18:43:29 +02:00
Steelpoint 35950b90fd SecMapChangeV3 2014-04-09 19:17:11 +08:00
Razharas f44e3ffbf1 Merge pull request #3244 from MrPerson/qdel_tweaks_3-31-14
More qdel() changes
2014-04-08 15:37:44 -07:00
Miauw 5abb553f4a Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
Conflicts:
	code/_onclick/telekinesis.dm
2014-04-08 14:29:58 +02:00
MrPerson dd8891ef35 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_tweaks_3-31-14
Conflicts:
	code/game/machinery/camera/camera.dm
2014-04-08 04:53:05 -07:00
Cheridan bea449125b Merge pull request #3354 from Ikarrus/doorelectronics
Updated the godawful Airlock Electronics interface
2014-04-08 01:44:37 -05:00
Razharas 03b34893d5 Merge pull request #3343 from Giacom/small_fixes
Fixes being able to change your chameleon jumpsuit's colour while dead.
2014-04-07 18:48:05 -07:00
Razharas ac72bcaa37 Merge pull request #3283 from Aranclanos/Blueprints
Fixes blueprints not being able to generate a second area.
2014-04-07 18:36:36 -07:00
Jordie0608 e58c90696a Hopefully merge conflict fixes 2014-04-07 21:46:06 +10:00
ikarrus f4c327ba26 Updated the godawful Airlock Electronics interface
Also added the ability to set if the door should require ALL listed accesses, or just one.
2014-04-06 15:04:31 -06:00
iamgoofball 810b91e7ac removes a ton of things checking the ticker to see if it's monkey, a gamemode that no longer exists. 2014-04-06 11:46:12 -07:00