Commit Graph

39 Commits

Author SHA1 Message Date
mwerezak
637f7193fc Fixes circuit var for other consoles
Also cleans up attackby while we're at it.
2014-05-22 18:05:57 -04:00
RKF45
5649bb7fe2 Various tiny improvements 2014-01-18 22:15:46 +01:00
petethegoat@gmail.com
11b17c4442 Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746
Standardization of the object tree and some modified functionality.
Moved a lot of storage/*_kit and similar boxes to storage/box/* ; most of these can now be found in boxes.dm. First aid kits remain a separate item type.
Replacement Light boxes pick up lights (for example broken ones) when used on them
Moved weapon/secstorage to storage/secure
Moved plant bags, ore satchel, trash bag, and sheet snatcher to storage/bag, in bags.dm
Fixed reagent_containers and snacks to pass through attackby() so the use_to_pickup code works. This affects plant bags, trash bags, and pill bottles.
Dice packs are now pill bottles, and all pill bottles can pick up dice.
Added error handling to uplink/generate_menu() so that one mistyped string doesn't bork the whole syndie uplink menu, since strings cannot be type-checked at compile time.
Cigarette packs and crayon boxes are now storage/fancy, however they retain existing update_icon() code.
Added a comment to storage.dm so that future people know where to look for use_to_pickup and allow_quick_gather code.

Updated all maps.

I've tried to test this thoroughly but I wouldn't be surprised if there were a few lingering issues. Try not to panic if you encounter any.

Full (i think) list of changed paths:
/obj/item/weapon/storage/flashbang_kit	> /obj/item/weapon/storage/box/flashbangs
/obj/item/weapon/storage/body_bag_box	> /obj/item/weapon/storage/box/bodybags
/obj/item/weapon/storage/chemimp_kit	> /obj/item/weapon/storage/box/chemimp
/obj/item/weapon/storage/trackimp_kit	> /obj/item/weapon/storage/box/trackimp
/obj/item/weapon/storage/seccart_kit	> /obj/item/weapon/storage/box/seccarts
/obj/item/weapon/storage/handcuff_kit	> /obj/item/weapon/storage/box/handcuffs
/obj/item/weapon/cigpacket		> /obj/item/weapon/storage/fancy/cigarettes
/obj/item/weapon/storage/mousetraps	> /obj/item/weapon/storage/box/mousetraps
/obj/item/weapon/storage/PDAbox		> /obj/item/weapon/storage/box/PDAs
/obj/item/weapon/storage/id_kit		> /obj/item/weapon/storage/box/ids
/obj/item/weapon/storage/lightbox/mixed	> /obj/item/weapon/storage/box/lights/mixed
/obj/item/weapon/storage/donkpocket_kit	> /obj/item/weapon/storage/box/donkpockets
/obj/item/weapon/storage/beakerbox	> /obj/item/weapon/storage/box/beakers
/obj/item/weapon/storage/syringes	> /obj/item/weapon/storage/box/syringes
/obj/item/weapon/storage/gl_kit		> /obj/item/weapon/storage/box/rxglasses
/obj/item/weapon/storage/diskbox	> /obj/item/weapon/storage/box/disks
/obj/item/weapon/storage/stma_kit	> /obj/item/weapon/storage/box/masks
/obj/item/weapon/storage/lglo_kit	> /obj/item/weapon/storage/box/gloves
/obj/item/weapon/storage/lightbox/bulbs	> /obj/item/weapon/storage/box/lights/bulbs
/obj/item/weapon/plantbag		> /obj/item/weapon/storage/bag/plants
/obj/item/weapon/storage/satchel	> /obj/item/weapon/storage/bag/ore
/obj/item/weapon/trashbag		> /obj/item/weapon/storage/bag/trash

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5494 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 19:11:56 +00:00
giacomand@gmail.com
76a6ef2252 -Cleaned up computers. Fixes Issue 1195
-Made computers use idle_power_usage and active_power_usage that it used from the MC.

I'm sure something is likely to break because I removed a lot of snowflake code. I tried to test all the computers with what I can but if you find something odd then please tell me.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5369 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-21 20:38:36 +00:00
johnsonmt88@gmail.com
dc599e776b Added emp_act() to some machines.
- Cell charger: Now calls battery emp_act() as well.

- Security Barrier: Now has a chance to toggle the lock.

- Flasher (portable and wall mounted machines, not the item): Now has a chance to flash.

- Wall-Mounted Sparker: Creates sparks.

- Light switch: Toggles the lights when emp'd (not that it'll matter since the lights will probably all have gone out anyway.)

- Weapon Recharger: Calls the energy gun's battery's emp_act() for guns and in the case of stun batons, it sets their charges to 0.

- Cyborg Recharge Station: Cyborgs now get ejected, then emp'd. There would probably be issues with emping the cyborg inside the machine, like being trapped forever or something.

- Sleeper: Eject's the patient. I kind of wish I could make it inject random chems, but it wants a usr and I'm not inclined to start mucking with sleeper code just for this.

- Space Heater: Calls the emp_act() for the battery inside the heater.

- Status Display: Causes the blue screen of death.

- Portable Atmos Pumps: Randomly changes the pressure, has a chance to flip the direction and turn the machine on/off.

- Portable Atmos Scrubber: Has a chance to toggle the machine on/off.

- Arcade Machine: Spits out some random prizes.

- Medical record computer: Runs through the medical records and has a chance to scramble the name, age, sex, blood type, physical or mental state of patients as well as a small chance to delete entries entirely.

- Security record computer: Runs through the security records and has a chance to scramble the name, age, sex, criminal status, physical or mental state of entries as well as a small chance to delete entries entirely.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5237 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-01 00:45:32 +00:00
Kortgstation@gmail.com
0c4f441cb5 Added Cheridan's slime sprites to replace roros. Replaced all mentions of roro/metroid with slime. Once Cheri has the rest of the sprites/Phol gets mutant race sprites I'll start work on redoing metroid/slime code with Giacom and adding breeding.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5223 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-29 04:12:22 +00:00
elly1989@rocketmail.com
4d9876fd65 Fixes issues with pen bbcode. Replacetext did not work correctly after I changed text2list - (It was missing 'needles' at the beginning of 'haystacks').
>dd_replacetext and dd_replacetext_case are now replacetext and replacetextEx respectively.
>replacetext and replacetextEx works using strings only; it doesn't convert it into a list and then back into a string.

Fixes some dumb-dumbs in textlist and text2listEx
> "<" where there should be a "<="
> no else case for when the separator is longer than the text (causing empty lists to be returned)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4971 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 21:21:17 +00:00
giacomand@gmail.com
6a2d78bc94 -Killed the updateDialog lag. I added a check to see if there were any mobs to update, if not it will stop checking until a user uses the machine again. I had to replace all the machine = src and machine = null with procs to help make it manageable. I believe this is one of the culprits causing the server to lag as the round goes on, as more players will interact with machines.
-Atmos delay is now based on active players, to help fight lag for massive player rounds.

-Changed some for(blah in world) loops to use the correct lists.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4958 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 19:15:51 +00:00
elly1989@rocketmail.com
4073ac9b00 Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.
All credits to the author for this handy little script.
I Committed the modified python script to tool directory. Although it needs to be in the root folder of your repo to work.

To notice the improved compile times, in dreammaker go to Build > Preferences > and untick "automatically set file_dir for subfolders"

If this commit inteferes with any large projects just revert it, do your thing, then rerun the script. Easy-peasy.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4488 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-18 16:33:40 +00:00
johnsonmt88@gmail.com
852b838e4e There were a bunch of boxes that had their own special code when they all do the same thing. So I've merged them into proper storage items.
Boxes affected:
- Donut boxes
- Egg cartons
- Candle packs
- Match boxes
- Snap pop boxes
- Monkey cube boxes

Items I didn't merge:
- Pizza boxes
- Cigarette packs

Pizza boxes are a whole new kind of 'special snowflake code' that is best left the way it is. Cigarette packs involve some stuff I'm unfamiliar with so that can wait until I learn what I need to learn.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4452 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-17 00:35:01 +00:00
sieve32@gmail.com
459c558898 -Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)
-Redid icons to be more optimized at compile by setting icon = 'icons/folder/icon.dmi' instead of just icon = 'icon.dmi', meaning that Dream Maker doesn't have to search through every single file for every single .dmi. This shouldn't lead to any errors because of how I went about it, plus the fact that Dream Maker would have freaked out if I screwed something up. Also moved around 2 icons that weren't sorted well.

r4146 compile time: 1 minute, 40 seconds
r4147 compile time: 45 seconds

[VGTG]

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4147 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-23 00:48:51 +00:00
baloh.matevz
f572819d51 - Removed an unneeded area
- Hopefully fixed the bug which allowed players to get a million toys from one arcade game.
- Removed poly's master controller failsafe due to it doubling up the master controller for no reason whatsoever.
- You can now redeem a full collection of mech toys at the quartermaster's for an actual mech!
- Added this stuff to the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4138 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-22 05:09:22 +00:00
johnsonmt88@gmail.com
188b487542 AI's are no longer permanently blinded by power loss. Fixes issue 603
- Thanks to Zekkeit/39kk9t for this fix!

Cultists now get stunned by their own stun rune again.
- Apparently this would have been game-breakingly spammable

Added WJohnston's mech toys as arcade prizes!

Made mech tool code less of a nightmare to navigate:
- Moved mech medical tools into their own .dm file
- Moved unused mech tools into their own .dm file

Fixed a major pAI exploit.

Fixed the odysseus picking up people who were buckled, causing the person to be unable to move.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3982 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-04 19:52:45 +00:00
daniel.cf.hultgren@gmail.com
aff56113a4 Made you able to disassemble a few more computers. These are:
* Arcade
 * Prison Shuttle Console
 * Area Air Control
 * Atmos Alert Computer
 * Mining Shuttle Console
If anybody is not okay with this, feel free to comment out the attackby code of that computer. But keep the circuitboard for future reference.
This should make all computers on the station be able to be disassembled.

Fixed some error message for cellchargers.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3683 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-27 13:45:01 +00:00
petethegoat@gmail.com
bf458c6f36 Removed water balloons from the arcade, on Urist-chan's orders~
Updated oldstation and uterus to use the new chair paths.
Removed tgstation.3.0.0.dmm, as the main mappers have no intentions to complete it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3149 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-18 20:35:57 +00:00
quartz235@gmail.com
5c53c4e7b7 -Fixed a typo that caused arcade machines to runtime 1/11 times
-Made water balloon have a lower case name for logical BYOND parsing

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3102 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 18:30:22 +00:00
baloh.matevz
3a0a764243 Crayon boxes are now storage items. I have no idea why they weren't storage items to being with but now they are.
6 storage slots, can only hold crayons. Icon_state is properly updated when crayons are taken out as well as when crayons are put in.

Updated uterus and 2.0.8 with the new type path, which is /obj/item/weapon/storage/crayonbox

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3082 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-11 01:46:19 +00:00
quartz235@gmail.com
a6c2e6e105 - Added water balloons (sprites courtesy of Sieve,) these can be filled with most reagents and burst on throwing if filled, applying the reagents to whatever is hit (along with everything else on that tile.) These are winnable from the arcade, for now. I'll probably think of a better way to implement them.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3075 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-10 06:55:03 +00:00
quartz235@gmail.com
b3f7865754 moving all the git stuff over to this so people who don't want to spend 8 years figuring out the bass ackward git system can actually run our server code
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2983 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-25 05:05:55 +00:00
mport2004@gmail.com
b5944308c7 Moved most of the computer defines into the proper code file.
Moved a few of the computers into their own files.
Security records now shows rank on the browse screen.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2909 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-03 21:16:48 +00:00
panurgomatic
32b2be1b5a - Simple event dispatch system.
- atom.forceMove() proc. Ignores density and other Move() restrictions, but calls Exited() and Entered()
- var/emagged moved to /obj/machinery class
- anyprob() helper proc.
- Mecha internal damage vars encapsulated.
- Mech Fabricators now require robotics ID to operate. Emag removes this restriction.
- Added Odysseus Medical Exosuit and it's parts. Has integrated Medical Hud and ability to mount medical modules.
- Added Sleeper Medical module for medical exosuits. Similar to common sleepers, but no ability to inject reagents.
- Added Cable Layer module for exosuits. Load with cable (attack cable with it), activate, walk over dismantled floor.
- Added another exosuit internal damage type - short circuit. Short-circuited exosuits will drain powercell charge and power relay won't work.
- You should be able to send messages to exosuit operators using Exosuit Control Console
- Gygax armour and module capacity nerfed.
- Exosuit weapon recharge time raised.
- Bugfix: EMP actually drains exosuit cell and damages it

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2780 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-23 10:54:23 +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
baloh.matevz
e8c6b08419 - Object tree grouped a bit more.
Two new categories were made: station_objects and effects. station_objects, which I'm sure someone will want renamed to 'structures' contains the objects which don't need process() or power code.

Effects contains objects which are either landmarks, triggers, spawners or decal.

Screenshot:
http://www.kamletos.si/new%20object%20tree.PNG

I didn't notice any bugs, but with a revision editing 276 files of byond code, you never know.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2323 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-03 06:54:28 +00:00
n3ophyt3
53da0c8bf1 Another arcade tweak.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2297 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-29 17:14:41 +00:00
n3ophyt3
3d5ccb7d72 Tweaked emagged arcades a bit, admins get informed when someone wins.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2285 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-28 22:40:02 +00:00
n3ophyt3
792f67a6f2 Arcade machines can now be emagged, do you dare play a round of Outbomb Cuban Pete?
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2284 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-28 22:15:06 +00:00
vageyenaman@gmail.com
3887ecb60c New admin feature: under the "Game Panel" verb, if the current mode is secret (or if you change it to secret) a new selection will appear underneath the Change Gamemode selection that allows you to "force" secret to be a certain game mode. This is mostly for adminfuckery where they make it wizard every single time for 10 rounds and the game mode is still secret.
Removed an unneeded metroid variable.

Added some more arcade names.

Fixed the grammars.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2182 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-12 03:11:42 +00:00
uporotiy
167a347526 Arcade machines now vend their contents (if they have any) before vending the standard prizes.
Spinning toy added.
Xbows now stun people instead of doing damage. (may be subject to change)
Fixed a changeling bug.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2157 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-08 12:24:32 +00:00
LastBattaWolf@hotmail.com
3d04e3505c pete is a feygoat
-snappops in arcades

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2082 316c924e-a436-60f5-8080-3fe189b3f50e
2011-08-31 20:31:52 +00:00
rastaf.zero@gmail.com
4f7030a426 Jack Rost updates:
-more dismantable consoles:
--Teleporter
--Supply ordering console
--Supply shuttle console
--Power Monitor
-new circuit boards (both constructable and destructable)
--Supply ordering console (programming 2)
--Supply shuttle console (programming 3)
--Outpost Status Display(programming 2)
--Operating Computer (programming 2, biotech 2)
-R&D Console circuit now requires programming 4 (was 6).


Balagi updates:
-Trash bag: works as mining satchels but for trash.
-Started redesign computers code
-fixed candles sprites
-trashbag now has "in hands" sprite
-fixed emagging supply shuttle console

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1883 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-18 19:17:58 +00:00
uporotiy
583b5a42cd Glowshrooms
Nerfed the spread rate and chance, made the suspectible to plantbgone and acid.
 Arcade
Added a new prize.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1528 316c924e-a436-60f5-8080-3fe189b3f50e
2011-05-04 20:15:14 +00:00
tronaldnwn@hotmail.com
75215318c6 Did some minor work on the void jet packs, they still aren't done yet.
Silly me forgot to add (src.loc) at the end of the prize things, after the whole map fiasco (and me needing to copy over file from my old folder to a new one).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1396 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-06 17:03:02 +00:00
tronaldnwn@hotmail.com
777e40b782 Arcade prize update:
Arcade prizes are now looking VERY REAL (as both of the head coders wanted them to look real again).

Toy E-swords sound real when you turn them on/off.

New toy! The replica red spess suit! Great for costume parties, not great for keeping security from chasing you down the hall, or space travel. Made of real plastic!

Now no one can bitch about the Ai satilite's teleporter suits. `~`

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1378 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-05 13:31:03 +00:00
n3ophyt3@gmail.com
44d0a3287c Added some name options for the arcade machines.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1149 316c924e-a436-60f5-8080-3fe189b3f50e
2011-03-01 16:59:11 +00:00
noisomehollow@lycos.com
86760c3841 RD now has a personal locker.
CMO now has a personal locker.
CE gets a pair of mag boots in his locker. Previously commented out.
Added department head sets to head lockers.
Fixed MULE dropoff at Security and Kitchen.
Syndicate space suits now slow you down by a small amount.
New prize at the arcade.
Added back Robocop selection for Security borgs.
More CentCom area adjustments.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@556 316c924e-a436-60f5-8080-3fe189b3f50e
2010-12-07 01:08:36 +00:00
n3ophyt3@gmail.com
31914a2704 Cleaned up toy.dm a bit.
Cyborgs now give "has been hit by the foam dart" messages when hit.

The toy sword and blink toy are now separate items instead of renamed/re-iconed teleport beacons/cardboard tubes.

The toy sword now acts more like a real sword in terms of its blade.

The blink toy still does nothing.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@212 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-29 01:48:01 +00:00
n3ophyt3@gmail.com
9ea60e6533 Added another new prize to the arcade machine.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@201 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-28 01:40:46 +00:00
n3ophyt3@gmail.com
f163f6d332 Added a new and exciting prize to the arcade machines.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@186 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-27 07:31:19 +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