Commit Graph

3807 Commits

Author SHA1 Message Date
Aranclanos f1677efdea Merge pull request #2040 from Razharas/master
Some logging and fingerprints
2013-12-17 21:03:36 -08:00
Aranclanos 53a02296df Merge pull request #1989 from Perakp/dnaDecon
DNA scanner and cloning pod deconstruction
2013-12-17 20:44:16 -08:00
Cheridan f6bf26e7e8 Merge pull request #2036 from Giacom/fridayfriday
Added the friday the 13th event!
2013-12-17 16:58:37 -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
Cheridan 0dde65750f Merge pull request #2038 from EuroNumbers/master
Pushing Turbine to be included in compile. Fixes interact() compile problem.
2013-12-16 12:30:45 -08:00
KazeEspada 7513625c48 fixes a rare runtime that occurs when the turbine couldn't find a compressor. Brings the code up to current standards. Removes the view function from the computer. Its rather obsolete in the days of telescreens. 2013-12-15 17:38:23 -07:00
EuroNumbers e9e9977249 Standarized the code further, added interact that doesn't shit the compiler 2013-12-15 19:23:54 +01:00
Razharas f2e0e5a193 Fixed minor typos and more use of new proc
Removed previously added ling logging proc, replaced with new one
Fixed some language
Fixed help and grab intent logging when you do it to yourself
2013-12-15 20:58:28 +04:00
Perakp 5d1f63f924 <span> and cable use()
- Added more span tags
- using cable now uses use()
- fixed use() to correctly return 1 when it succeeds
- checked that there were no checks that would’ve been previously
borked. For testing purposes I renamed use to use_cable (‘use’ is kinda
bad for a proc name, but use_cable is hardly better), but left that out
of the commit because it would’ve inflated the pr.
2013-12-15 12:07:55 +02:00
Aranclanos 1ecd895bce Merge pull request #2011 from Incoming5643/wands2
Magic Mania (Summon Magic/Charge/Wands&Staffs/One Time Spellbooks/New Apprentice)
2013-12-14 19:58:17 -08:00
Razharas 4dfbe1cbf7 Mistook the mobs in human_attackhand, fixed now
Happy little accident
2013-12-15 07:26:54 +04:00
Razharas 5045069899 More logging and fingerprints
Added helper proc for general logging, replaced some logging with this
proc
Pulling now leaves fingerprints
Judging by the opinions in the thread will add some more
logging/fingerprints
2013-12-15 05:23:50 +04:00
Incoming c9f69869f2 Aranclanos Fix Omnibus
*Removes zapping oneself by attackselfing a wand, leaving clicking yourself while holding the wand the only way to do it because...
*Removes the warnings for zapping yourself with bad wands. Careful with that wand of death, kids!
*Removed some redundant lines
*Adds logging/sounds to zapping yourself
*Removed the change to wizard_continuous_rounds. It will become it's own PR
*Removed some redundant lines
*Uses the mob/living revive() proc to heal/raise people using the wand/staff of animation
2013-12-14 19:40:58 -05:00
EuroNumbers 279e84f12b Updates turbine.dm to bypass the 'code\modules\power\turbine.dm:234:error: interact: duplicate definition' 2013-12-14 20:16:25 +01:00
Giacomand 045e68f1cf Added the friday the 13th event. It will basically cut the event frequency in half to simulate unluckiness. 2013-12-14 00:49:27 +00:00
Aranclanos 3e54ed6d54 Merge pull request #2017 from Giacom/screen_shaking_fix
Fixes the screen shaking from having your camera get stuck on a turf.
2013-12-13 13:50:51 -08:00
Giacom 7473950247 Merge pull request #1996 from Incoming5643/happyholidays
[map] Do they know it's Christmas time at all?
2013-12-13 13:30:24 -08:00
Giacom dc9ba09a22 Merge pull request #2013 from JJRcop/doomsday
Adds Doomsday to holidays
2013-12-13 13:28:05 -08:00
Giacomand eb61c70cb3 Merge branch 'master' of https://github.com/tgstation/-tg-station into centcom_typo 2013-12-13 21:19:55 +00:00
Giacomand ceec829294 Tons of typo fixes and renames Centcomm to Centcom. Manual merge of #1950. 2013-12-13 21:14:23 +00:00
Giacom e596ffe2ba Merge pull request #2001 from EuroNumbers/master
Turbine v2.0 - first step
2013-12-13 09:36:09 -08:00
Giacom b0c36c2709 Merge pull request #2005 from ACCount12/master
Syringe gun - now 80% more gun! Fixes #1935
2013-12-12 16:16:16 -08:00
Incoming 5012ccd273 Merge branch 'master' of https://github.com/tgstation/-tg-station into wands2
Conflicts:
	icons/mob/back.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2013-12-12 00:38:47 -05:00
Incoming c396c3ae8a Suggestion implimentation patch!
*Span classes the whole update
*Spellbooks no longer vanish after being used, instead used spellbooks now have various bad effects should they be attempted to learned from again (the original reader won't acidentally fall to this, as they will just say "I've already read this"). Leave em out as traps for people or properly dispose of your trash! Or...
*The charge spell can now attempt to recharge one use spellbooks so someone else can learn the spell. This only has a 20% success rate and will destroy the book should it fail (even if the book was actually unused). You can't attempt this on the wizard's spellbook
*The "staff of nothing" (functional) placeholder now uses the generic staff sprites
*Spellbooks can now be placed in bookshelves just like normal books
*The teleport spell won't yank anchored things anymore, but as a consolation it will warp the entire contents of a tile should it be targeted. The code has been tweeked so this shouldn't effect the server too bad even if large numbers of items are warped to unique locations this way
2013-12-12 00:24:51 -05:00
Aranclanos c04938cbc1 Merge pull request #1968 from Adrinus/12-03-13-Orion_Trail
Adds a new Arcade Machine.
2013-12-11 16:37:11 -08:00
Cheridan 193d63c0e1 Merge pull request #2008 from Giacom/xmas_newshat
Added a santa hat icon for the entertainment monitor. Made it change in the Xmas event.
2013-12-11 09:47:53 -08:00
Giacomand 92480d60b4 Fixes the screen shaking from having your camera get stuck on a turf. 2013-12-11 04:17:46 +00:00
Aranclanos 1ee59747c4 Merge pull request #1940 from YotaXP/HTML-Entities-and-Timestamps
NTSL, parrots, and ID consoles hate apostrophes less.
2013-12-10 04:53:09 -08:00
Incoming b7b05d53ec Code optimization and copypasta removal:
the teleport wand now uses do_teleport
the polymorph wand now uses wabbajack in both instances

You can now click on yourself while holding a wand to cast it on yourself in addition to clicking on the wand itself.

Changed how guns/magic are given out slightly. Previously no antag could get a gun/magic thing (including survivors made by the spell in the case of multicasting) but now antags who aren't the wizard or an apprentice of the wizard also get one.

Fixed a few bugs on accidentally burning charges by click in places tht wouldn't actually fire the wand/staff
2013-12-10 01:04:16 -05:00
Aranclanos 8f1f632b35 Merge pull request #2000 from Cheridan/PlantThatGrows357Revolvers
Plant that grows 357 revolvers
2013-12-09 17:43:35 -08:00
Giacomand 25c43d0a98 Added a santa hat icon for the entertainment monitor. Made it change in the Xmas event. 2013-12-09 19:35:31 +00:00
Incoming 51d12a7512 Adds all sprites for all wands, books, and the staff of healing
Fixes an issue where someone spamming a wand might lose charges without actually firing the bolt
Removes a few missed bugtesting lines
Adds a var (variable_charges) to be disabled for wands with assured max charges for future use
2013-12-09 12:46:34 -05:00
Giacom caa8190d61 Merge pull request #1994 from cem/chem
Increase Chem Dispenser window height
2013-12-09 08:30:03 -08:00
ACCount 5fde461f1e Syringe gun wants to be real gun! 2013-12-09 21:40:51 +12:00
JJRcop 0e62ab1adc Adds Doomsday to holidays 2013-12-08 20:41:02 -05:00
EuroNumbers 29d637240f Update turbine.dm
Replaced outdated code that wounded up there for no reason.
2013-12-09 01:25:10 +01:00
EuroNumbers 64c08c6482 Update turbine.dm
Made compatible with LINDA
2013-12-09 00:17:03 +01:00
EuroNumbers 372992ca36 Lowercased "gas turbine control computer" 2013-12-08 22:47:29 +01:00
EuroNumbers c2a4de92cc Update turbine.dm
Turbine now works as intended in rev4407
Tweaked the power generation too to fit the increased demand
Still needs a better computer code
2013-12-08 21:33:25 +01:00
Cheridan f96755857d The plant that grows .357 revolvers. 2013-12-08 13:32:33 -06:00
Cheridan b949afd872 Merge pull request #1970 from Ikarrus/adminnotice
Admin Notices
2013-12-08 10:32:45 -08:00
Incoming 3432aaf583 Adds a christmas tree to the bar
Adds a festivus pole to the science break room
Adds a santa outfit to the captains office so he can spread cheer to the crew
2013-12-08 13:23:55 -05:00
Cem Kocagil d29f583062 Increase Chem Dispenser window height 2013-12-08 18:34:59 +02:00
Aranclanos 552c77fd81 Merge pull request #1990 from VistaPOWA/aluminium
Replaces 'aluminum' with 'aluminium'.
2013-12-08 07:32:54 -08:00
Aranclanos 498ba1acd4 Merge pull request #1964 from Limeliz/href-fixes-round-3
Href fixes round 3
2013-12-08 07:10:15 -08:00
Pete Goodfellow 9692e1a70c Merge pull request #1973 from KazeEspada/lootfix
Lootspawner bug fix.
2013-12-08 04:09:16 -08:00
Aranclanos c6db228a46 Merge pull request #1936 from Perakp/faceHuggerRuntime
Fixes alien embryos from runtiming when checking limbs
2013-12-08 02:41:07 -08:00
Aranclanos 11bf118652 Merge pull request #1982 from Giacom/ghost_colours
Added anonus' rainbow ghost icons for BYOND member content.
2013-12-08 02:37:39 -08:00
Aranclanos 5cf0f4765f Merge pull request #1929 from adrix89/Equip
Quick equip active storage,toolbelt,backpack.
2013-12-08 02:03:34 -08:00
Aranclanos 8251c0ea42 Merge branch 'HydroTweaksNov2013' of https://github.com/Rolan7/-tg-station into HydroTweaksNov2013
Conflicts:
	html/changelog.html
2013-12-08 06:29:48 -03:00