Commit Graph

33 Commits

Author SHA1 Message Date
elly1989@rocketmail.com
7b720a20b6 >Moved most of the helper procs into code/__HELPERS. If you see ANYTHING generic enough to be a helper proc just throw it in there and help purge the copypasta 5ever
>Replaced dd_text2list, dd_text2listcase, tg_text2listcase and tg_text2list with text2list and text2listEx. text2list will return a list of each and every character in the string if you set separator=""
>added return_file_text(filepath) which returns text from a file after doing some checks: does the file exist? is the file empty? It prints helpful error messages to the world.log if it runs into problems
>Replaced dd_file2list(filepath, seperator) with file2list(filepath, seperator). It just calls text2list(return_file_text(filepath), seperator). rather than copypasta
>Replaced time_stamp() so it's not as retarded
>Lots of the world setup stuff uses file2list now, rather than file2text -> sanity -> text2list
>Added error() warning() testing() procs. These print messages to world.log with a prefix. e.g. ## ERROR: msg.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4948 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 14:39:36 +00:00
giacomand@gmail.com
c207124142 New item "camera assembly" that is dispensed from the autolathe. (700 Metal/300 Glass), deleted old grenade camera assembly.
It will construct a camera after doing the following steps:
Wrench it to attach it to a wall
Weld it to the wall with a welding tool (Welding Helmet Required)
Attach wires to the camera
Possible extra steps in order to create special cameras (X-Ray, EMP Proof, Motion) (You can have more than 1 special attachment, meaning it can be possible to have an EMP Proof, Motion, X-Ray camera)
X-Ray will need carrots (something for botanists) (this will possibly changed, well it will definitely carrots are weird)
EMP Proof will need solid plasma.
Motion will need a prox sensor.
Screwdriver the panel closed to complete the camera.

To deconstruct the camera, it would be not so difficult to disable but it will take a while to completely remove it:
Screwdriver the panel open
Cut all the wires, cutting the alarm wire is optional.
Weld it.
It is now a camera assembly again.

Gave the cameras wires to cut/mend/pulse. Random wires for every camera to make hacking it harder.
Focus wire. Will make the camera have a shorter or normal vision range.
Power wire. Will disable the camera. Pulsing will make it kick anyone who is viewing it through a security computer. Will give a tiny shock if not protected.
Light wire. Will disable the "Toggle Camera Light" that the AI has. Pulsing it will disable/enable it.
Alarm wire. Will warn the AI that a camera's alarm has been set off, when this wire has been cut/pulsed. Does nothing else. Should only triggered once, meaning.. setting off the camera won't set it off ever again..
Special wire. Will toggle the special attachment of the camera. Pulse toggles, cutting disables, mending enables.
Nothing wire. Does nothing, just here to add more wires and make guessing which wire does which harder. x 3

Placed extra cameras, I can't recall all the places but here are some.
Around solar array entrances
Around EVA
Around the security back maintenance door
Place an X-Ray camera in the Living Quarters.
Bartender back room
Virology living quarters
Chapel crematory
A camera on the outside of Telecomm's external airlock
X-Ray camera outside every escape pod station.
Inbetween toxins test site and the station(?) There's cameras there already
Inbetween viro and medbay i think ^ I mean inside maintalright
private study? (library back room)
engineering secure storage
X-ray camera in toilets (both of them)
Both maintenance access that you find between important areas (captain room, teleporter room)(HoP office, staff meeting
Custodial Closet
Surgery Observation
Atmospherics Maintenance
Infront of Atmos
mining maintenance
Kitchen cold room
Hydroponics Storage
Emergency storage (both)

Other Map changes
Add red phone in Cyborg Station
Add AI restorer to Cyborg Station room
Added some camera assemblies in the Cyborg Station, inside a crate!

TODO:

Get camera alarms to give the AI a link to press, to jump there.
Standardize wires or something. There's a lot of copy+paste..

OTHER:

With the new camera stuff I got rid of the default x-ray cameras. Though there still are x-ray cameras placed around, watching you sleep.

Added Lugar223's improved vending interface. http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=9586

Some runtime fixes.

Added a second buffer for Cyborg cameras. Hopefully it'll make freelook less laggy.
Increased the first buffer to 2 seconds.
Some tweaking to stuff.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4606 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-02 23:20:40 +00:00
johnsonmt88@gmail.com
0225ed33b7 Cleanup of proc/helpers.dm
Split a bunch of procs in helpers.dm into new files:
-helper_list
-helper_text
-helper_type2type

These files are sorted into groups internally. Hopefully people will make it easier for people to find useful procs.

I've added comments to a good chunk of these procs as well explaining what they do.

I've removed a few unused or unnecessary procs and fixed up a couple that were not working as intended.

I've also moved a mob proc 'get_equipped_items()' into mob/inventory.

All of the non-helper.dm files (besides mob/inventory.dm) are the result of fixing duplicate procs. It seems that there used to be text searching procs where one was case sensitive and one was not, and at some point someone removed the case-sensitivity of the case sensitive procs. I've re-added the case-sensitivity and as a result, I've had to go through extra files and ensure that they were calling the proper proc.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4341 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-08 19:32:08 +00:00
johnsonmt88@gmail.com
52dd7b3af5 Cleaning up machine process()s
But first! Unrelated to process():
- Only humans and monkeys can move into sleepers.
- Immovable rods no longer delete themselves if they hit a shuttle. Instead they act as if the shuttle doesn't exist. This should help cut down on rods deleting themselves before going through the station.

And now back to our regularly scheduled programming...

Removed process() that were doing nothing from:
- Dispenser(the one that dispenses O2 and Plasma tanks)
- Robotic Fabricators
- Crew Monitoring computer

Reworked hydroponic's process(). 
- Merged if statements together since most of them lacked "else if"s or were duplicate checks.
- Changed a while loop into a for loop as sloppy coding or an admin var-editing could cause an infinite loop.

Removed a sleep(100) { process() } from the operating table's constructor as the MC will call process() regardless.

Cleaned up shieldgen.dm
- Changed a while loop into an if statement. The loop was unnecessary
- Moved some stuff around so it's not nearly as confusing.
- Standardized the proc and variable definitions.
- These are not currently in-game but they are amazing items. I'll see about sorting out their bugs and getting them in proper working order.

Removed a for(var in world) from
- cleanbot process()
- floorbot process()

Removed computer/engine/process() from robot/computer code
- /obj/machinery/computer/engine does not exist in the first place...

Note: These are only some of the machinery process()s. I didn't want to potentially break too much at once. More to come.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4017 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-08 19:40:10 +00:00
elly1989@rocketmail.com
48088b79d9 ugh...this was horrible. I'm really sorry if I fucked anything up, I was literally going braindead towards the end.
Replaced every l_hand = and r_hand = and all that if(hand) crap to use standardised procs. This means we can use procs like Dropped() reliably as they will always be called when things are dropped.

Thorough documentation to come. But generally, if you want a mob's icons to update after deleting something in the inventory...use drop_from_inventory(the_thing_you_wanna_drop) just before deleting it. If you wanna put something in a mob's hands use put_in_hands() (or one of the variants). It'll try putting it in active hand first, then inactive, then the floor. They handle layers, overlays, screenlocs calling various procs such as dropped() etc for you. Easy

mob.equipped() is now mob.get_active_hand() because there was another totally unrelated proc named equipped() and stuff was confusing.

Weakening was made instantaneous.

Minor optimisations for human/handle_regular_status_updates(). I'll port these changes over to the other mobs next. Basically it should stop it constantly incrementing every status effect even after death.

umm... bunch of overlays related fixes... I think that's everything. :/

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3900 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-23 21:24:45 +00:00
baloh.matevz
21f99dd0c5 - Got rid of the browser tab
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3834 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-15 18:16:42 +00:00
baloh.matevz
a80a08f457 - As approved by head coders this revision is a revert of DMF vending machines. The interface was restored to the html driven one from before that. The reason for the revert is the lack of a fix for the DMF-related vending machine UI bugs which include the splitting of the interfaces across the DMF screen and the browser window when hacking. The 2nd bug is the lack of a proper update to the items in the DMF list when coins are used. I also personally think the DMF UI was really, really ugly, but that's just personal taste.
(The chemical dispenser continues to use the DMF interface as there is nothing broken with that)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3833 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-15 17:58:59 +00:00
johnsonmt88@gmail.com
3ae7acf8f2 Committed for Sieve:
Fixed an error in door_assembly.dm regarding glass doors not getting sprites.

Cleaned up astroid floor code.
-Bombing astroid floors (sand) will now 'dig' up sand.

TK users no longer get shocked while bashing grilles using TK.
- Range check on grille shocking. Fixes Issue 419.

Added to the lighting checks for Plantmen. They should no longer starve on the shuttle. Fixes Issue 471.

Bombs now affect people inside lockers. Fixes issue 208.
- Modified Sieve's original change so that the contents of the locker get severity+1. Meaning a weaker severity meaning the locker offers some protection.

Vending machines and mass driver buttons now leave fingerprints. Fixing issue 542.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3800 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-12 04:45:38 +00:00
baloh.matevz@gmail.com
c2c7a3bcda - Variable declaration standardization. Big commit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3671 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-25 19:26:36 +00:00
trubblebass@gmail.com
2d95a92602 Commited on behalf of Nodrak
- Fixes: Issue 257, Issue 346 and Issue 343
- Monkeys no longer continue to take suffocation damage after dying.
- PDAs can no longer be used while stunned or paralysed.
- Vending machines now have a delay to stop product spamming.

Note: I upped the delay a little as it was still pretty spammable when I tested it, seems to be fine now as it's way more effort than it's worth to empty a vending machine.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3107 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 21:06:22 +00:00
vageyenaman@gmail.com
b21a604c11 Vending machine GUI overhaul. Love it or hate it (sorry Erro)!
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2694 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-16 00:06:59 +00:00
baloh.matevz@gmail.com
b30bfac8f9 - added feedback logging for alert levels
- alert level descriptions are now part of the config file config.txt
- alert levels default to the ones I had before, if the config file isn't configured.
- Restored a HTML vending machine interface, an updated one. (I have limited time so I'll commit this one too, it's part of the bundle i coded while offline today and I don't have time to separate it before discussing it. I'll revert it later if needed)

Vending machine demo:
http://www.kamletos.si/vending.html

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2641 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-08 11:09:01 +00:00
petethegoat@gmail.com
5d4b707553 Fixed all known problems with vending machines.
Fixed a minor visual bug with emagged lockers.
Minor botany rebalance by Numbers.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2595 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-03 15:36:17 +00:00
petethegoat@gmail.com
5545d032be Experimental DMF vending machine update, by Tobba.
Pretty sure everyone who cares knows about this already, but the low down is that shit is more responsive and potentially prettier.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2529 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-18 00:45:50 +00:00
mport2004@gmail.com
46a7143e3a Energy projectiles work again.
Rewrote the job selection system to use bitflags and the jobs are now objects.
Fixed a path conflict with effect which caused a few things to be unable to be clicked on.
Commented out the job.txt, Urist if you still want it to load from the .txt give me a yell and I can update it to work with the job objects.
Fixed up the bits that were missing the slightly updated mob organ attack code.
Moved the traps file into unused.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2340 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-11 07:52:30 +00:00
mport2004@gmail.com
17ed3899c4 Fixed the map/code issues that the body bags caused.
/obj/effects is now /obj/effect.
/obj/station_objects is now /obj/structure.
Did a bit of minor blob work. 
The Bay 12 body bags were replaced with closets because having two sets of code that do almost the same thing is silly.
Changed back a few of the last jobproc edits as the remove from list before assign was a check to see if the mob was fucked up and if it was remove it so we did not check it again as it would still be fucked up.
The medbay/tox monkeys names are random once more.  More random name monkeys will help with changeling and clean up the observe/mob menus.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2324 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-03 10:28:57 +00:00
petethegoat@gmail.com
bcdc8d259d Uploading resin & membrane sprites for Urist.
Only vending machines which accept coins have a coin slot.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2294 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-29 15:07:10 +00:00
baloh.matevz
4944729976 You can now attach a string to coins using cable coil (remove with wirecutters). With a string attached you have a chance to recover the coin when buying an item from a vending machine that requires a coin.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2212 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-17 13:43:57 +00:00
baloh.matevz
48e5403e72 You can now insert a coin into a vending machine. Some (currently only cigarette machine) have special items which you can only get to with a coin. No, hacking will not allow you to get to these items.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2209 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-17 01:17:36 +00:00
baloh.matevz
e2ffd2f5b2 Updated the interface a bit to allow a built-in browser.
The upper right panel, where the verbs usually are now has two functions, verbs and the browser. This feature has been added to hopefully reduce the number or pop-ups that appear. Currently only request consoles and vending machines use this feature. I'll wait for feedback and then update the rest, if feedback is positive.

Also removed the redcoat spawn pack... The redcoat suit is MINE.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2170 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-10 19:35:54 +00:00
Superxpdude@gmail.com
edd3fa0f9f MEDBAY AND RESEARCH DIVISION HAVE BEEN COMPLETELY REMAPPED.
Added a CMO biosuit (Sprites thanks to Petethegoat)
Scientists and the RD no longer have medbay access, as research now connects to the hallway.
Added a wall-mounted medical vendor.
Committing some stuff for Petethegoat: http://nanotrasen.com/phpBB3/viewtopic.php?f=7&t=5744&p=49236#p49236 For more info regarding the patch.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2060 316c924e-a436-60f5-8080-3fe189b3f50e
2011-08-29 03:04:52 +00:00
Superxpdude@gmail.com
39e3cbe08b Commiting some stuff for Petethegoat from this thread: http://nanotrasen.com/phpBB3/viewtopic.php?f=7&t=5744
For those too lazy to read the thread:
Vending machines now have a switch inside the maintenance panel that when flipped, turns off those pesky advertisements.
A bunch of unused delivery locations have been removed.
You can no longer attack yourself with that bag of cheesie honkers you just finished eating from. Mining Satchels and trashbags now default to picking up everything on one tile.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2027 316c924e-a436-60f5-8080-3fe189b3f50e
2011-08-19 23:58:44 +00:00
polyxenitopalidou@gmail.com
e47dfe68fa •Runtime error fix for all the vending machines. Stop fucking using :s you faggits.
Untested, but I'm losing my bass here. Will test in 3 hours when I'm back home.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1927 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-25 15:14:28 +00:00
firecage@hotmail.com
94d5be982c These updates has been committed for Petethegoat, Trubble_Bass and Derp__. Please yell at them and not be if anything is broken.
--------------------------------------------
Pete

Changelog:

Appendicitis!
It's a new disease which must be cured surgically- instructions are available on the wiki:
http://tgstation13.pretentiousfool.com/wiki/index.php/Surgery

Tell Petethegoat either on the forums or on IRC if you find any problems.

------------------------------------------------

Trubble has fixed a bug with the hat crates. They can now be correctly opened.

-----------------------------------------------

Derp has added the Medborg. YES!!!
Service borg has also recieved some minor tweaks. It can now use the Booze-o-mat. it can also extrude enzymes.

------------------------------------------------

Report any problems to them via Forums or IRC. Thankyou.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1866 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-16 20:47:46 +00:00
baloh.matevz
1644364643 Newly created computers and vending machines in unpowered areas will now start as unpowered.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1476 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-20 09:26:36 +00:00
rastaf.zero@gmail.com
ad6a6e42aa Penlight fits in medical belt.
Fixed several runtime errors.
Monkeys and aliens won't stack dozens of blood stains.
Fixed crash in FEA code related to melting floors.
When screwdrived destructive analyzer unlink from RD console protolate instead of itself.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1443 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-14 03:52:09 +00:00
rastaf.zero@gmail.com
c9591221f4 INSULATED UPDATE
electrocution:
  while breaking a light: chance quartered, damage quartered
  vendomats and autolathe: damage reduced by 30%
  hacking an apc: chance reduced
  In general electrocution was nerfed a bit. Now you shouldn't be instacrited by grille/airlock unless someone wired engine directly to the power grid.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1024 316c924e-a436-60f5-8080-3fe189b3f50e
2011-02-12 01:07:03 +00:00
baloh.matevz
1e0b699e35 engineering changes from previous revision added to current map. going to 2.0.2 where lag should be a thing of the past.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1007 316c924e-a436-60f5-8080-3fe189b3f50e
2011-02-09 20:19:54 +00:00
rastaf.zero@gmail.com
427313e0ad Shocking overhaul. Fixed bugs are:
- shocking by autolathe, vendomats and airlocks works if powernet has power OR if APC has charged battery;
- autolathe able to shock without cable underneath;
- improvements from Barhandar and Errorage are included;
- making stungloves may electrocute you;
- handmade stungloves partially loses insulating;

Eliminated 4-seconds lag caused by all apcs changing state to "fully charged" after first few minutes of game.
Fixed message "The airlock's motors resist your efforts to pry it open."
Latest innovations in nanotechnologies! Matchbox now fits in pocket!
Fixed burn_skin(), so containment field now hurt people properly.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@919 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-27 16:40:36 +00:00
uporotiy
2d21a52a42 Blob upgrade and reskin. Apparently it's nigh invincible, but playtesting will sort out if it's too much powerful.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@233 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-30 20:28:45 +00:00
Skiedrake
78fc52ef11 Merge to main from the hydroponics branch r57_skie_1.
Hydroponics update + bugfixes.
Consists of revisions: 
R58, R60, R67, R68, R73.


Combined changelog (from oldest rev to newest):

Put all hydroponics defines into one .dm file
Added functionality for nettles and made all currently growable plantlife work
Changed hydroponics layout
Added Hydroponics Supply crates and added weed/pest sprays into the current ones
at hydro
Fixed nettle hold graphics
Fixed vending machines showing hidden items.
Added Research Director hydroponics access and botanists tox access (already had
chem access, but no tox).
Hydroponics in great shape. Spank Numbers for final modifications before merging
to trunk. (weedkillers, pestkillers)
Added a seed vending machine.
Amanitas now poison, and the poison is nasty. Added a poison() proc to all
foods.
Added graphics for vertical and horizontal one-tile-wide tables. Put one inside
hydroponics.
New 'blur' texture when your vision goes blurry.
Fixed a typo in hydroponics code.
Added a disposal unit in hydroponics.
Added a how-to instructions paper in hydroponics.
Hydroponics in working order. Extra features still in developement.
Fixed weedspray and pestspray entries.
Removed chaplains random probability to have see_invisible 15 at start, because
it's reset to 0 right next world tick anyways.
Added burn() and drug() procs to foodstuffs.
Added drug effects to some mushrooms. Have a nice trip.
Made chilis heat you up and ice peppers freeze you down.
Fixed carrot's harvest icon (it didn't exist)


To-do: Mutagens and vitamins for hydroponics plants.
New mutations, recipes for cook, extracting stuff from plants.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@74 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-07 19:33:23 +00:00
datdoodlemaster@gmail.com
92e2fedd2b Edits the Assistant Storage vendor into a separate object. Adds hidden item amount variable.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@11 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-29 02:13:44 +00:00
only.lurking
662c08272a git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e 2010-08-23 14:29:20 +00:00