Commit Graph

173 Commits

Author SHA1 Message Date
Menshin
8933943b50 Prevent using force pull on paper bins to grab them from the other side of the station. 2014-10-12 01:43:27 +02:00
Cheridan
f5b5ead3ef Merge pull request #4516 from MrPerson/examinate_the_doctor
Change examine() from an atom verb to a mob verb
2014-10-05 23:37:34 -05:00
Cheridan
08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
MrPerson
651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
Miauw
7c97447d24 Balance changes to the sleepypen. 2014-09-05 18:24:25 +02:00
Miauw
78a9b0be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into say()
Conflicts:
	code/__HELPERS/game.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/requests_console.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/objects/items/devices/PDA/radio.dm
	code/game/objects/items/devices/aicard.dm
	code/modules/admin/admin_verbs.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/voice.dm
	code/modules/mob/living/carbon/brain/brain.dm
	code/modules/mob/living/carbon/human/whisper.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/say.dm
2014-08-31 13:40:16 +02:00
MrPerson
a23dbe2357 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
Conflicts:
	code/game/objects/items/devices/radio/radio.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/events/ninja.dm
	code/modules/power/cell.dm
	code/modules/power/port_gen.dm
	code/modules/reagents/reagent_dispenser.dm
2014-08-29 04:21:15 -07:00
Firecage
dac8669166 Span classes for files in the following module folders: assembly, client, detectivework, events, hydroponics, mining, paperwork 2014-08-23 10:13:21 +02:00
MrPerson
44383ec1c8 Disregard that I suck cocks 2014-08-21 07:35:51 -07:00
MrPerson
d0c97aae72 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/game/gamemodes/cult/ritual.dm
	code/game/gamemodes/nuclear/pinpointer.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/status_display.dm
	code/game/objects/effects/decals/crayon.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/airlock_painter.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/storage/secure.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/mousetrap.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/slime/examine.dm
	code/modules/power/cable.dm
	code/modules/reagents/grenade_launcher.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/recycling/sortingmachinery.dm

Thanks Firecage, this is all your fault
2014-08-20 05:54:20 -07:00
AndroidSFV
cab1fe8e25 Bug fixes to AI photography Ext. 2 2014-08-13 14:42:36 -05:00
Miauw
891546aa56 More work on saycode. 2014-08-05 16:02:21 +02:00
AndroidSFV
fad2bb1244 Fully implemented AI photography, with HUD! 2014-07-30 15:21:30 -05:00
paprka
3bf4ecfba5 fixes laziness 2014-07-18 18:30:23 -07:00
Alex
2d4ca8d363 Merge pull request #4150 from Ikarrus/miningfix
[MAP] Mining Delivery System
2014-07-17 09:30:19 +01:00
ikarrus
0a62bfb159 part II 2014-07-13 13:43:07 -06:00
ikarrus
9d2bed1501 [MAP] Mining Delivery System
-Redone the delivery system on mining to send the unrefined ore from the outposts to the mining station, ready to be picked up by miners, instead of being fed directly into the smelting line
-Smelting line still exists, but starts blocked off
-Updated paper with correct instructions on where to redeem points
-Fixed mint's atmos and door name. Added a camera there, too.
2014-07-13 13:30:57 -06:00
Miauw
4eb83ed546 Oh, not in cruelty, not in wrath
The Reaper came that day;
An angel visited this damned sat,
  And took the parapen away.

Replaces parapen with sleepypen that contains 30u of sleeptoxin and 30u of a new mutetoxin that makes you unable to speak.

Mutetoxin can be made with 2 parts uranium + 1 part water + 1 part carbon.
2014-07-12 17:48:33 +02:00
AndroidSFV
da1f3a7fce AI photography ext 2 DO NOT MERGE YET 2014-07-06 12:06:44 -05:00
Kelenius
d8ae776f64 Gives the AI a hud 2014-07-03 18:52:11 +04:00
MrPerson
c43518351f Some fixes and minor improvements to examining. 2014-06-13 09:01:52 -07:00
MrPerson
59d64656c4 Some fixes and minor improvements to examining. 2014-06-09 11:35:29 -07:00
MrPerson
645ca7f8a1 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
Conflicts:
	code/_onclick/click.dm
	code/game/atoms.dm
	code/game/objects/items/toys.dm
	code/modules/paperwork/folders.dm
	code/modules/power/cable.dm
2014-06-09 01:50:44 -07:00
ikarrus
01c28c7afc Fixed indentations. 2014-05-14 09:02:53 -06:00
ikarrus
8496ec8dd1 Should be auto-mergable again 2014-05-14 08:57:52 -06:00
ikarrus
593c95cc4f [MAP] Firing Range Instructions
-Added instructions to the firing range.
-Set a default path for the controls
-Controls are no longer dense
2014-05-10 19:53:48 -06:00
ikarrus
47fbd14f57 Glory to absolute pathing 2014-05-06 09:02:19 -06:00
ikarrus
82639d14a6 Secret Document Objectives
Adds new steal objective "Secret Documents"
-A set of secret documents spawn in the vault's filing cabinet, but even syndicate documents qualify as valid steals

Adds the exchange objective for traitors
-If there are at least 6 traitors, two of them will be selected to make an exchange of secret documents
-There is a low (20%) chance that one of them will have an additional backstab objective, where they will require both sets of documents to win
2014-05-04 15:00:47 -06:00
MrPerson
9d9a657acf Change examine() from an atom verb to a mob verb
Just in time for the feature freeze, a big change that will introduce bugs! Yay!
Mob verb is called verb/examinate(target), which just calls target.examine(user) and face_atom(target)
For explanation why, see http://www.byond.com/forum/?post=1326139&page=2#comment8198716
Long story short, mob verbs are much faster than object verbs. The goal is to make right-click menus populate faster.

Also changes a bunch of examine() procs to always, ALWAYS call the parent. Except mobs, but you have 1 guess why I'm not touching them. Mostly this affects obj/item/examine().
And also remove a whole shitload of pointless set src in view(2) kind of crap. Also span classes.
2014-05-01 09:56:39 -07:00
phil235
c08a40e56b fixes polaroid camera description 2014-04-30 19:34:35 +02:00
Miauw
658c753989 Revert "Merge pull request #3218 from AndroidSFV/aiphotoext2"
This reverts commit f2d850ee25, reversing
changes made to 805e2570bf.
2014-04-21 18:59:58 +02:00
AndroidSFV
58b602a59e Gia's Feedback. Thanks!! 2014-04-12 14:01:02 -05:00
AndroidSFV
50cd395c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into aiphotoext2
Conflicts:
	code/datums/wires/robot.dm
	html/changelog.html
2014-04-08 09:28:42 -05:00
AndroidSFV
c7c085ffee Reduces "much duplicate" code. 2014-04-06 11:58:53 -05:00
Giacomand
e8d7526a0c Merge branch 'master' of https://github.com/Giacom/-tg-station into sec_maglite 2014-04-02 17:11:52 +01:00
Giacomand
f2bfa3f5d4 Renamed maglite to seclite.
Refactor'd can_hold and cant_hold to use type paths instead of strings.
Removed an undefined object from the medical belt's can_hold list.
2014-03-29 11:10:35 +00:00
AndroidSFV
cd11d87254 Added some feedback to cyborgs and others nearby when they print a picture. 2014-03-29 02:44:49 -05:00
Giacomand
cc1d87afcf Adds the maglite. Security spawns with it in their sec belts. They have a decent force value and are a little better than the common flashlight. Sprites by Nienhaus. Can be held in the sec belt and the armour vest. 2014-03-29 00:54:50 +00:00
AndroidSFV
40119ada0c AI Photography Extention #2
Gives the ability to take and view photo to Cyborgs

AI's share their photo album with connected Cyborgs, and connected Cyborgs have the pictures they take saved to the AI's album. If a Cyborg is not connected to an AI, photos are saved to the Cyborg's camera object. If a Cyborg has photos in it's album while not connected to an AI, but is subsequently connected to an AI, the photos are added to the AI's album. This is initiated by pulsing the appropriate wire on the borg.

Cyborgs can attach images to newscaster feeds, from the active album available to it (the AI's, or its own if disconnected)

Cyborgs cannot interact with photocopiers, but however have become a moving printer. They are every inefficent at printing, and thus can only print two color pictures before needing to be refilled with toner (simply click on them with toner in active hand).

Added some span classes to the previous AI photography work.

One minor bug fix to photocopier which could result in a photo object ending up in the 'hand' of an AI or cyborg.
2014-03-28 07:31:14 -05:00
MrStonedOne
f374d4c8fe Fix for issue 3190
Fixes deletion of src object rather than the intended p objected, also
ensures ai/onclick doesn't depend on the photography module being
present or bug free by gracefully handing the lack of a aicamera object.
2014-03-26 16:46:38 -07:00
Mloc-Hibernia
8af8a43d6f Initial pass to convert LF to CRLF
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-03-24 08:53:40 +00:00
MrPerson
9eee3e5067 First pass at a qdel() garbage collection system for tgstation
Works pretty well. If it can't GC something, it'll just del() it and be done.
Speed is amazing, holy shit.

New procs you should be aware of:
qdel(atom/movable) - sets up an object for garbage collection. Call this rather than del(atom/movable).
atom/movable/Destroy() - called right before the object is GC'd, so it still has a loc. Also called if the object is del()'d.
new controller - garbage.dm has all the details on this. Basically it nulls all references on GC'd objects and force del() them if necessary.
Generally speaking, objects should use Destroy() for behavior prior to deletion rather than Del(). You should also always call the parent so the object gets the right gc_destroyed var set.

ISSUES:
Tries to GC mobs atm. This actually works for new players, not so much for humans/monkies/simple_animals/anything. I'm guessing it needs to clear out their mind and HUD and maybe other things.
Gibbing is really bugged. It works, but the overlays just sit there for awhile and ugh. I'm very tempted just to del() mob/living and mob/camera and call it a day.
qdel() equipment doesn't unequip the item.
Pipes don't generally GC correctly. Debugging suggests they get referenced in many pipenets and that isn't cleared properly. However some do work fine. Need assistance here.
Bots don't GC, probably in the radio controller.
Lots of other shit doesn't GC but it's hard to find them because of the pipe spam.
I think I'm calling Destroy() twice by accident.
2014-02-23 14:55:12 -08:00
Razharas
ff27f5d426 Merge pull request #2826 from YotaXP/polaroid-fix
Long overdue fixes to the Polaroid cameras.
2014-02-20 16:22:59 -08:00
fleure
e80dd57ef4 Merge pull request #2819 from YotaXP/fix-1957
Fixes major security exploit regarding JavaScript injection.
2014-02-19 18:34:48 +00:00
Razharas
5a8eed4c32 Merge pull request #2824 from hornygranny/throw_range
throw_range pass
2014-02-18 16:17:13 -08:00
YotaXP
35ba26b3ea Fixed coloring, overlays on overlays, and blood trails. 2014-02-18 16:54:22 -05:00
Miauw
3b24bb64f4 Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
Conflicts:
	code/modules/mob/transform_procs.dm
2014-02-18 18:22:40 +01:00
YotaXP
ee58c42570 Long overdue fixes to the Polaroid cameras.
- Mobs lying down are captured properly.
- Hair and other coloring is captured properly.
- Darkness is now captured, though other area effects are not.
- Object layering is much more accurate, though still not perfect.
- Objects that were missing should now be visible.
- Objects that should not have been visible should now be gone.
- Some objects (like blood trails) are not yet captured properly.
2014-02-17 21:41:56 -05:00
Hornygranny
2134add41b Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range. 2014-02-17 15:44:07 -08:00
WitheredGryphon
e1ec5cf54f Fixes major security exploit regarding JavaScript injection. 2014-02-17 12:53:41 -05:00