Commit Graph

2521 Commits

Author SHA1 Message Date
Pete Goodfellow
29e92f59cd Adds an exception for the janitorial cart to spray bottles. 2013-03-30 04:18:03 +00:00
Pete Goodfellow
2c9283dd05 Merge pull request #154 from aranclanos/Second
Surgery bugfix without other commits.
2013-03-27 12:52:36 -07:00
Pete Goodfellow
1260c80d6b Merge pull request #87 from Giacomand/Solar_Branch
Fixes the solar control computer so it's overlay works in auto mode.
2013-03-27 12:18:58 -07:00
Cheridan
10bd174a03 Underwear update! Adds two new undie styles, a modest tankini for ladies and red briefs for the guys.
Adjusts a couple hardcoded lines to make adding more undies in the future easier.
Adds dressers! Similar to mirrors, they let you change your underpants.
2013-03-27 00:08:45 -05:00
Uristqwerty
bf4b58cc7d Fixed infinite loop in powernet rebuild.
If a machine was not anchored, it would spin forever, doing nothing.
Fixed on baystation a while ago.
2013-03-25 16:28:04 -04:00
Pete Goodfellow
a389835a30 Abstract items no longer show up on examine. 2013-03-24 23:43:58 +00:00
Aranclanos
327d3db770 Fixes items calling their afterattack() proc when they are used on surgeries, for example, inserting a syringe inside of a person and then starting to inject the contents of the syringe on said person.
afak, surgeries can't be handled on the afterattack() of the different surgery tools because of cavity implants, so this is a semi-decent fix that can be used for future features too. But I do not like touching this code. I appreciate any feedback about this.
2013-03-24 08:53:29 -03:00
Cael Aislinn
4c240f718e Merge pull request #76 from Cheridan/master
Glowshroom Reworking
2013-03-22 19:04:04 -07:00
Cael Aislinn
ff1f98023a Merge pull request #47 from Giacomand/NTSL_Fix
NTSL Commit Times. [Immersion] [Realism]
2013-03-22 19:02:54 -07:00
Cael Aislinn
472af68510 Merge pull request #74 from rastaf0/improvement-debug-tools
Improvements to debug verbs del-all and spawn.
2013-03-22 19:02:39 -07:00
Giacomand
e83432c07d * Fixes the solar control computer so it's overlay works in auto mode. 2013-03-23 00:13:19 +00:00
Carnie
986b06bb10 Merge pull request #59 from Nodrak/master
Airlock Painters
2013-03-19 21:37:33 -07:00
Giacomand
005ea828ac Merge pull request #56 from aranclanos/master
Fixes for screen HUD object icons.
2013-03-19 16:06:15 -07:00
carnie
c5b4fe9610 Merging Cheridan's chemistry reagents tidy-up and bottle-emptying confirmation. 2013-03-19 06:30:41 +00:00
carnie
2819651811 Very minor optimization to MrPerson's changes.
Replaced some ifs with a switch statement.
Replaced an uneeded loop through a list (list.Remove() does this anyway)

Signed-off-by: carnie <elly1989@rocketmail.com>
2013-03-18 03:15:31 +00:00
carnie
809539603b Merge branch 'master' of git://github.com/MrPerson/-tg-station into Testing 2013-03-18 02:20:15 +00:00
carnie
0ca3088074 Merge branch 'master' of git://github.com/Giacomand/-tg-station into Testing 2013-03-18 01:13:52 +00:00
Cheridan
9c8505bd44 -Recodes glowshrooms.
Fixes the bug with effects/glowshroom not glowing when placed.
They don't spread infinitely: The odds of a shroom spreading decreases with each generation. Because they're sane now and not virally-spreading fungal horrors, they've been changed to spread on normal station floors and not just the asteroid.
The spreading glowshrooms acquire the parent's stats, with some mutations.
The delay variable is now based off of production, and goes DOWN with better stats instead of GOING UP.

-Removes unnecessary (copy-pasted) code bits in walking mushroom/killer tomato code in grown.dm
2013-03-17 19:24:51 -05:00
MrPerson
8448fc0104 Remove that annoying ass "is_special_character used on an unknown silicon" debug message. 2013-03-17 16:34:49 -07:00
Rastaf.zero
b8a0032f61 Improvements to debug verbs del-all and spawn.
Long paths are shortened, del-all got filter like spawn had.
Long lists of paths are cached.
2013-03-17 17:49:35 +04:00
Cheridan
4dec216887 -Adds a confirmation message to the Empty Spray Bottle verb.
-Reorganizes all the copy-pasted reagents in Chemistry-Reagents.dm. Cuts out about a THOUSAND lines.
-Sleep toxin is made more subtle. No blurry screen, but you might yawn some. Chloral no longer has an instant KO effect, but your vision will become blurry and you'll be unable to run once injected. It is metabolized faster as well.
2013-03-16 19:40:44 -05:00
Aranclanos
eeb0e1dbe3 Same change here, but with monkeys. 2013-03-15 06:39:46 -03:00
Aranclanos
dcfa1fcfab Fixed items not appearing on the HUD if they are given to a mob by another player with the strip panel.
This should also swap under the carpet (kinda ugh because the problem is still there and it might affect some other things) the problems with the roundstart problems with player's icons on high populated servers.

This should be the first step to reduce the amount of calls on the different icon update procs, but for the moment I'm focusing on more CPU expensive procs.
2013-03-15 06:08:48 -03:00
Benjamin Read
74f1c14fe2 *Fixed this buggyness and now it compiles. 2013-03-15 10:53:56 +11:00
Benjamin Read
f2ec2d5d66 *Unbuggered the buggered up code.
I swear, I'll get better at this. It works now.
2013-03-15 10:39:57 +11:00
Benjamin Read
3032c1b765 *Cleaned up grammar here and there
*Made unpopped popcorn do a tiny bit of damage (using 0.1 units of sacid)
2013-03-13 13:47:52 +11:00
Benjamin Read
60c3057978 Merge branch 'master' of https://github.com/sawu-tg/-tg-station into food-stuff 2013-03-13 12:43:26 +11:00
Giacomand
5e5f3ab1d7 * Committing in NTSL now takes time. It can take up to a maximum of 2.5 minutes and a minimum of 10 seconds.
* The server will not warn admins when empty code is being compiled, but it will still log everywhere else.
 * Empty code will have no compile time.
 * Removed NTSL broadcasting the names in italics if the name is unknown. This was causing issues and it was a very minor feature.
 * Placed some duplicated code into a proc, for the IDE verbs.
2013-03-13 00:12:40 +00:00
Nodrak
beedf1bfb0 Airlock painters! Commit for Ricotez
- Adds a new device that will paint airlock assemblies. This works on both solid and glass airlock.
- Click on the sprite of the painter to set it.
- Uses toner as 'ammo'
http://forums.nanotrasen.com/viewtopic.php?f=16&t=12053

Featuring Teh_Wolf's paint sprayer sprite complete with inhands!
2013-03-12 19:36:15 -04:00
Giacomand
af525cb75b - Urgent fix to NTSL. Sanitizes the output of NTSL, including the broadcast() function.
- Added a GetCleanVar to be used when getting a global variable to use inside the game code, it will sanitize() the variable if the compare argument is not equal to it; the compare argument should used to see if NTSL has changed the value.
 - Added a sanitize_data proc for the signal datum. It will sanitize all the data using strip_html_simple().
2013-03-12 16:50:28 +00:00
MrPerson
af938060f6 Revert "Remove transfer_fingerprint_to in favor of add_fingerprint"
This reverts commit 4a7ba48b11.

I misunderstood what this proc was doing.
2013-03-12 08:22:17 -07:00
Benjamin Read
80734523fd *Moved chocolatebar/attack_self() to super
*Moved chocolatebar/proc/Unwrap() from super.
2013-03-13 00:16:41 +11:00
MrPerson
4a7ba48b11 Remove transfer_fingerprint_to in favor of add_fingerprint
Add_fingerprint has sanity checks, which makes it a superior proc.
This fixes at the very least:
The following runtime has occured 14 time(s).
runtime error: Cannot execute null.Copy().
proc name: transfer fingerprints to (/atom/proc/transfer_fingerprints_to)
  source file: detective_work.dm,155
  usr: Engineering Cyborg-743 (/mob/living/silicon/robot)
  src: the disposal pipe (/obj/structure/disposalpipe/segment)
2013-03-12 04:40:00 -07:00
MrPerson
b76f521767 Fixes for the following 3 runtimes
runtime error: Cannot read null.occupant
proc name: Topic (/obj/machinery/computer/scan_consolenew/Topic)
Added a check to make sure there's an occupant.

runtime error: Cannot read null.key
proc name: toggle power (/obj/machinery/particle_accelerator/control_box/proc/toggle_power)
Added a check for if there's a usr.

runtime error: Cannot read null.backup_author
proc name: attack hand (/obj/machinery/newscaster/attack_hand)
Added a check for if the feed still exists.
2013-03-12 02:27:57 -07:00
Giacomand
64971367a7 - Removed unneeded tags in the map file. The map was updated to Pete's changes to the sleeper before it was changed.
- Moved the cable define into the cable file.
2013-03-12 00:12:24 +00:00
Benjamin Read
bd142ae236 -Basic new 'fluff' system on eating.
* allows for random verbs per item while eating, and for items to be wrapped and require unwrapping before eating.

* this resolves the hunger message bug

* chocolate utilizes the unwrapping method using an all new sprite

* multiple items have been assigned custom verbs

* beet soup switch condensed
2013-03-12 09:42:09 +11:00
MrPerson
eb95e92d78 Err... ok so now is_special_character() is good. Sorry. 2013-03-11 11:59:18 -07:00
MrPerson
520a9cfdcd Tweaked is_special_character() to be meaner, leaner, and less buggy
Not that those bugs matter, they only effect traitor cyborgs.
2013-03-11 10:10:19 -07:00
Cheridan
971cf6e628 Cable coils and cable cuffs now use the inhand sprites. Only red and blue, for now. 2013-03-11 11:53:27 -05:00
Christian Bielert
51b6b9de60 Merge pull request #30 from MrPerson/master
Remove mind.original
2013-03-11 08:19:19 -07:00
MrPerson
a88b30ab31 Removed mind.original
All usage of it on silicons is replaced by is_special_character()
is_special_character moved from admin.dm to mob_helpers.dm
Also fixed a runtime having to do with objectives.
2013-03-11 05:40:21 -07:00
Pete Goodfellow
5ddcc63b83 Removes an unnecessary check from the gun afterattack(). flag does handle rechargers. 2013-03-11 04:52:53 +00:00
Pete Goodfellow
b02c459505 Adding google code commits r5836 to r5849. RIP in peace google code. 2013-03-11 04:26:54 +00:00
d_h2005@yahoo.com
a0045477be -Committing a slightly changed version of Startoad's bureaucracy crate patch.
-Dualsabers now come in the alternate colors, sprites courtesy of mjrseph.
-Adds the Vealrender, a harmless and goofy version of the veilrender, courtesy of supersayu. You can possibly find it in mining asteroid surprise rooms.
-*flap and *aflap are gender sensitive now, whoa!


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5834 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-09 06:00:40 +00:00
petethegoat@gmail.com
97e0f9b6f7 Smallified Centcomm and removed a large amount of the unused machines. This affects most stuff on z2.
Removed the administration shuttle and the stupid alien dinghy.
Removed the beach (hey, it's an away mission now).

Removed syndicate deathsquads on account of them being stupid and redundant.
Temporarily removed regular deathsquads- search for "DEATH SQUADS" to find the locations to uncomment. Additional code is in unused/specops.dm and unused/specops_shuttle.dm.

Added a single tile fake window for unsim windows.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5831 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-09 04:35:37 +00:00
Kortgstation@gmail.com
39145b95b0 Added admin logging to cutting power cables. It was incredibly easy to release the singularity/depower the station without leaving any record at all.
Added admin logging for people shooting fuel tanks to detonate them.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5829 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-09 02:21:01 +00:00
petethegoat@gmail.com
6ff8d60a15 New sprites for alien zone selection from Cheri~
Slightly updated how zone sel picks icons to enable this. First bit of OOP in hud code, I think.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5828 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-08 23:10:24 +00:00
petethegoat@gmail.com
1af9267159 Fixed the plasmafire theme active left hand sprite.
Fixed the baton text styling.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5827 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-08 22:13:54 +00:00
petethegoat@gmail.com
8ff7285645 Updates HUD stuff!
The main goal was to remove all the pointless shit in the UI style dmis, but this commit actually goes a bit deeper than that.

Formally renames the "hurt" intent to "harm", in line with everything else in the world.

Removes the old screen1_... .dmis. They've been replaced with screen_... .dmis. They function much the same.
screen_gen.dmi is used for things which apply to multiple UI styles, such as storage slot sprites, or the intent selector. (These can still be overridden in HUD code, though.)

Item action buttons have been changed to use a template from the UI style, and the icon_state of the item.
var/icon_action_button has been removed- varvar/action_button_name must be used instead to add action buttons for items.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5826 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-08 21:32:00 +00:00
giacomand@gmail.com
feabd92251 - Cleaned up the hostile mobs. It will also factor the mech's location, making sure it isn't too far away before doing a line of sight calculation. Moved these calculations into the ListTargets() proc, so nothing else bugged out because they didn't account for the mech's line of sight.
- You can now resist to unbuckle yourself, without having to click the chair!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5823 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-08 18:10:14 +00:00