Commit Graph

4677 Commits

Author SHA1 Message Date
carnie 05afc4f52c Substitute for the getrev code. Unfortunately, it only fetches the commit-hash for HEAD.
This should be sufficient for our needs though.

Signed-off-by: carnie <elly1989@rocketmail.com>
2013-03-20 04:31:02 +00:00
carnie 8152283edc Disables the code for fetching SVN-revision info.
Obviously, this is because we have emigrated to github.
2013-03-18 05:33:31 +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
carnie c983e287a3 Modifications/RuntimeFixes for Majorseph's cigarette lighting stuff:
>type mismatches in cigarette/attack()
>mob overlays now update correctly when lighting somebody else's cigarette/cigar/pipe/etc
>removed some copypasta procs (pipe/light(), pipe/attackby() and cigar/attackby())

Signed-off-by: carnie <elly1989@rocketmail.com>
2013-03-18 00:13:44 +00:00
carnie a72805134f Merge branch 'master' of github.com:tgstation/-tg-station into CigaretteLighting 2013-03-17 23:45:39 +00:00
Rockdtben 15cd1eee56 Added a define for consider_superconductivity()
Added a define for a new constant present in proc/consider_superconductivity(starting)
2013-03-17 18:35:24 -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
Rockdtben eed47ccea5 Made a calculation constant.
The old version would do the same calculation over and over again. Since this calculation contains no variables it can be changed to a constant.
2013-03-17 18:34:02 -05:00
carnie 45b708c819 Merge branch 'master' of git://github.com/majorsephiroth/-tg-station into CigaretteLighting 2013-03-17 17:39:32 +00:00
aranclanos 2167bc4e49 Merge pull request #54 from sawu-tg/food-stuff
Proper bug-fix of the Food-fluff.
2013-03-14 21:04:59 -07:00
Benjamin Read 74f1c14fe2 *Fixed this buggyness and now it compiles. 2013-03-15 10:53:56 +11:00
Christian Bielert a88e08561e Merge pull request #41 from sawu-tg/food-stuff
-Basic new 'fluff' system on eating.
2013-03-14 07:01:36 -07:00
Giacomand 8bb0ac8a1d Merge pull request #48 from aranclanos/master
EMP effects get garbage collected
2013-03-14 01:45:52 -07:00
majorsephiroth d3f7959350 Changelog updated. Added the ability to help people light cigs with cigs/cigars.
Signed-off-by: majorsephiroth <majorsephiroth@hotmail.com>
2013-03-14 10:44:22 +11:00
carnie 805e6344ad Merge branch 'master' of github.com:tgstation/-tg-station into Upstream 2013-03-13 19:04:03 +00:00
carnie 21949a5d2b Committing Elo001's job management stuff.
I made some very minor modifications (mainly tidied up the code a little bit so it's easier to read/modify).

I have made it so opened_positions can be negative. This means that reopening original positions, which were just closed, no longer requires an annoying cooldown period.

Removed the "AI" "Cyborg" "Assistant" checks since they were already handled within the blacklist.

The can_close_job and can_open_job procs now return codes for different reasons for failure (this removed a little bit of code duplication)

Nice work for a first commit, Elo :3
2013-03-13 18:54:09 +00:00
MrPerson 8f740222ef DNA Machine tweaks to fix runtimes for when the machine disappears
Really a fix on the commit from earlier, which I'm aware didn't work. I tested this extensively, works just fine.
2013-03-13 05:06:40 -07:00
majorsephiroth 33905ce24a Expanded what can light things. Cigars and pipes can now be lit by standard sources. Standard sources are: Lighter, Zippo, Igniter, weldingtool, energy sword, and candles. 2013-03-13 16:17:02 +11:00
Aranclanos e62295e98e Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds) 2013-03-13 00:08:20 -03: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
Elo e78896676b Forgot to remove a testing-output 2013-03-12 18:55:15 +01:00
Elo 4b76bcc2e0 Added logic checks to my stuff in topic() so you can't bork the server by griefing with byond://?src links 2013-03-12 18:46:20 +01: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
MrPerson a00e456b9c Moved a check in the DNA machine to hopefully fix that pesky "but there's nothing connected!" runtime.
Thanks Carn and CIB.

The following runtime has occured 7 time(s).
runtime error: Cannot read null.occupant
proc name: Topic (/obj/machinery/computer/scan_consolenew/Topic)
  source file: dna.dm,891
  usr: Trey Campbell (/mob/living/carbon/human)
  src: DNA Scanner Access Console (/obj/machinery/computer/scan_consolenew)
2013-03-12 07:38:19 -07:00
MrPerson 71ad5c0faa Runtime fix for Telecomms machines, hopefully
Runtime in question:
The following runtime has occured 17 time(s).
runtime error: Cannot read null.name
proc name: Topic (/obj/machinery/telecomms/Topic)
  source file: machine_interactions.dm,346
  usr: M.I.N.D. (/mob/living/silicon/ai)
  src: Bus Mainframe (/obj/machinery/telecomms/bus/preset_three)
2013-03-12 07:19:04 -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
Elo 1a97f052f5 Re-enabled closing original positions with a cooldown 2013-03-12 11:23:24 +01: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
Pete Goodfellow 30be75160a Improves readability of /obj/machinery/Topic(). Includes text styling. 2013-03-11 22:41:26 +00:00
Pete Goodfellow 38bad51a6d Fixes gcode issue 1380. Updates and improves cryo and sleepers, including standardization and text styling.
Changes the heater to use freezer sprites.
Updates the map with sleeper directions, and Cryogenic2.dmi with sprites.
2013-03-11 22:40:53 +00:00
Elo b5b7ddcaa5 Modifies ID computers to allow opening additional positions for latejoiners. Very restricted at the moment to test how it's used by the playerbase
See http://forums.nanotrasen.com/viewtopic.php?f=16&t=12490&p=195140#p195140 for details
2013-03-11 21:00:39 +01:00
MrPerson eb95e92d78 Err... ok so now is_special_character() is good. Sorry. 2013-03-11 11:59:18 -07:00
carnie 7c01c25232 Merge branch 'master' of git://github.com/Cheridan/-tg-station 2013-03-11 17:51:19 +00: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
Giacomand 9593bf4fc2 Merge pull request #32 from Petethegoat/issue_1376_fix
Rewrote how handcuffs work. Fixes gcode issue 1376.
2013-03-11 09:51:37 -07:00
Pete Goodfellow 14b1777359 Rewrote how handcuffs work. Fixes gcode issue 1376.
Includes standardization and text styling.
2013-03-11 15:54:00 +00:00
Christian Bielert 51b6b9de60 Merge pull request #30 from MrPerson/master
Remove mind.original
2013-03-11 08:19:19 -07:00
Pete Goodfellow 5f2d7eb9c0 Added the slashes before the paths. 2013-03-11 14:13:47 +00: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 4812d3deed Cleanup of recharger code, including text styling.
Makes removing items from the recharger go straight into your hand.
2013-03-11 04:52:04 +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