Commit Graph

155 Commits

Author SHA1 Message Date
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
Kelenius
d8ae776f64 Gives the AI a hud 2014-07-03 18:52:11 +04: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
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
Hornygranny
9d3f8f6a2d second pass 2014-02-15 20:11:12 -08:00
Hornygranny
9e14c22747 Reduces throwspeeds on all items to realistic levels. 2014-02-15 19:58:03 -08:00
hornygranny
e0d0cedf36 passed over everything with throwforce 2014-02-13 18:06:50 -08:00
Miauw
9b8656247c u_equip is now called unEquip PANIC 2014-02-13 20:58:33 +01:00
MrPerson
931da9e7ef Many changes
Much diff
2014-02-04 22:49:38 -08:00
Cheridan
75fde99810 Fixes issue 2560 - blueprint photos not counting for objectives
wow lets use the same name for our object variables and all our arguments and parameters this will never make things terrible
ever
2014-02-03 12:23:16 -06:00
Cheridan
bb9c09df46 Obsoletes flags = FPRINT | TABLEPASS*
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.

Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.

If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only  where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
fleure
b07bca861f Fixes paper with no input looking populated 2013-12-28 16:30:50 +00:00
Giacomand
44895bf36f Merge branch 'master' of https://github.com/tgstation/-tg-station into tinypricknomore_andgunstuff
Resolved Conflicts:
	code/modules/projectiles/projectile.dm
2013-12-18 18:27:22 +00:00
Giacom
90972ba593 Merge pull request #2052 from Aranclanos/PhotocopierCooldown
Photocopier runtimes fix.
2013-12-18 10:12:03 -08:00
Razharas
358a85eb3d Completed the transition to a new proc
All the logging i have found in the code was changed to use the
proc(maybe i missed something)
Killed all runtimes found so far
Proc now handles all the checks, no need to add checks in the body of
object
2013-12-17 22:56:04 +04:00
Aranclanos
fd87128f57 Added some checks on the photocopier after the sleeps to avoid runtimes and made a new var "busy" to avoid exploits that ignored the wait times. 2013-12-16 22:08:10 -03:00
Giacomand
4b4735fb22 Made changes based on feedback.
The pen/hypo/borghypo doesn't give a poke message when it fails to inject someone wearing protective gear.
Fixed a typo.
Reworded the can_inject() error message for humans so it makes sense with a normal pen.
Made the combat hypo (nuke ops item) ignore protective gear, to allow syndies to heal their comrades.
2013-12-13 22:51:44 +00:00
Giacomand
130803fcd9 * Added the THICKMATERIAL flag. It is used for thick coverall suits (space suits, firesuits, etc) and it will stop injections from syringes, hypos and parapens. It is also used for head items such as biohoods and space helmets. If you aim for the head, it will check if you can inject through the head equipped item, if you aim anywhere else it will check the external suit.
Let me know if I missed an item or if you don't think an item should have the flag.

* Cleaned up a bit of the gun code.
* Fixed an issue with shotgun darts not working in barrel shotguns.
* Made the on_hit() have a zone, will be used for syringe guns in another PR.
* Removed the unused sleepy pen.
* Changed /obj/item/weapon/gun/projectile/shotgun/pump/sc_pump to /obj/item/weapon/gun/projectile/shotgun/sc_pump, there was no /pump/ anywhere else.
* Shotgun darts will follow the new flag.
* Shotgun darts are now open containers, and I removed the snowflake check for them in syringes.
* Added logging for reagents in any projectile.
2013-12-13 00:00:20 +00:00
Kyrah Abattoir
560b50ec1b Reformatted the way objects and items structure their description text, added the little object "icon" everyone seems to be using.
Added superclass invoke for the arcane tome

Added superclass invoke to light switches, removed it's (unused) description.

FLightswitch description repetition derp

examine superclass invoke for gas flow meter, space heater, fire extinguishers, grenades/IEDs, fancy boxes and welder. Changed description for welder and fire extinguisher to show their content in a similar style.

Fixed tank, linen bins and janicart description, and added welder of previous commit (forgot to commit it)

REMOVED icon in mop_bucket description (now provided by item class).
REMOVED unused examine() override in clothing/gloves
REMOVED custom examine() for glass/rag
CHANGED using examine superclass on paperwork/paperbin, removed redundant description code
CHANGED examine superclass for power/apc
ADDED universal maxcharge readout for all the powercell types.
CHANGED using examine superclass on machinery/light, removed redundant description code

FIXED weapon/virusdish use a description field.
TWEAK lowercased some of the portable generators.

Fixed improperness of pacman names
2013-11-16 22:15:50 +01:00
Miauw62
ffae53cbe0 Added another right parenthese. 2013-10-27 15:12:39 +01:00
Miauw
0e889b7eb8 Fixed another runtime with ass copying. 2013-10-27 15:04:10 +01:00
Miauw
c57fb1dc6e Fixed the last issues of asscopying before merge. 2013-10-26 20:42:17 +02:00