Commit Graph

7134 Commits

Author SHA1 Message Date
Aranclanos
7bb4cf6a79 Makes the attackby() of storage objects return 0 if the can_be_insterted() fails. This will fix hand labelers on pill bottles. 2013-12-18 12:25:39 -03:00
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
Cheridan
91354fd75f Merge pull request #2045 from Incoming5643/wands2
A change to how "continuous_round_wiz" works
2013-12-16 12:03:06 -08:00
Adrinus
1d173fe020 Adds a deck of cards. Works like real cards, without all the shuffling.
Fixed a few unforseen bugs and smoothed out a few odd quirks.
Fixed bugs, added flipping mechanics. Made the cards less cheater friendly by making certain actions visible.
Added the ability to choose between "Random Card" and "draw from Top" with a verb on the deck.
While held in hand the deck can now be shuffled.
Had to improve sprites, was really bugging me.
Now uses the shuffle() list helper.
Added cardshuffle.ogg to sound/items/
Cooldown applied to shuffling for "sanity" as the term seems to be.
Made a few changes to the way the cards prompt you for less clutter.
Merge pull request #1 from Zelacks/deckstuff
Replaces the global decks variable with a reference
Now card is taken from hand on topic choice.
Examine card has been scrapped, just attack_self() with the card to see what it is.
New Icons. Dig that NanoTrasen blue. Thanks Nienhaus!
Merge pull request #2 from Zelacks/deckstuff
Hopefully you will like these changes - Several deck changes
Fixed a few nits and picks.
Made Deck of Cards available as a prize from the arcade machines.
Merge pull request #3 from Zelacks/deckstuff
Card sprites! Thanks, was toying with doing that, saved me a bundle of work!
Fixed the adjacency issue.
Added more checks to the cards and object verb.
Adeed a series of fixes to the Mousedrop function. Made all notices uniform. Made changes to keep cards being flipped by the wrong sorts.
Added Razharas' "more readable" pixel art for the cards.
Made messages about the deck work while the deck is held. (I guess you might want to carry it)
Un-Needed cooldown removed from shuffling the deck.
Added blue contours to the cards to make them stand out against floor tiles.
Merge branch 'master' into 11-23-2013-Games
2013-12-15 23:43:08 -05: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
Razharas
b88af75828 And some more mistakes fixings
Yeah i suck at english sorry
2013-12-15 23:12:56 +04: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
Incoming
1275e8bff8 A change to how "continuous_round_wiz" works
Currently, if the config option for continuous wizard rounds is off the round will end immediately following the death of the wizard.

With this change after the death of the wizard the game will additionally check to see if the wizard has made any antagonists that are still alive to do things after his death. The round won't end unless these antags don't exist or have all already died as well.

This allows for summon guns/magics survivors to not get blueballed out of antag round because the wizard died quickly. Additionally this allows wizards who made apprentices the chance for them to get the wizard alive again (the new healing apprentice has a staff that can raise the dead who is uniquely suited to this task.) Additionally additionally this allows for a mindswap wizard to not get instantly meta'd out when the round doesn't end when the wizard's head is caved it WITHOUT forcing extended on people.

This change was originally part of the Magic Mania pull, but was removed and placed in its own PR on request.
2013-12-15 02:07:28 -05: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
Perakp
834ae673f1 usr null checks
- added some null checks in places where they might be needed, made use
of existing null checks where possible
- changed text formatting to <span> where easily done
- changed a few pixels so cloning pod doesn’t bother me anymore
2013-12-14 17:28:24 +02: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
Cheridan
6534218b38 Merge pull request #2027 from Razharas/master
Added logging to stings
2013-12-13 13:33:28 -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
Razharas
431c40200b Who need coding, better to fix some more grammer
Stung, not stinged
2013-12-13 15:47:35 +04: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
Razharas
9f617549ee Made it a little proc
Should be better now
2013-12-13 03:42:52 +04:00
Razharas
5c3018e094 Added logging to stings
Gia said so
2013-12-13 03:17:22 +04:00
Incoming
aed746f18f A small change to how wizard rounds end when continuous wizard rounds are off:
After the game has determinded that the wizard is dead it will check if there's any traitors alive. "Traitors" in this instance means apprentices and survivors the wizard may have created with contracts/summon guns/summon magic. Thus if the round still has a chance of being interesting (survivors) and/or the wizard has a legitimate chance at revival (apprentices) the round keeps going.
2013-12-12 12:11:49 -05: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
Adrinus
6402574be8 Made emp_act available to all arcades. Made prize vending with filled boxes a proc for use by any arcade machine. Names of your crew are now generated from the same name lists as random characters. Cleaned up the Topic code so there were less duplicate lines. 2013-12-09 15:41:27 -05: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
Cheridan
edce4a5d40 Merge pull request #1952 from Ikarrus/nuke
Adjustments to nuke object
2013-12-09 11:21:39 -08:00
Cheridan
2dad72b63a Merge pull request #1993 from Razharas/master
Added tips when setting/unsetting stings
2013-12-09 10:33:48 -08:00
Razharas
9aca471af5 More consistency in grammer
Thats what you get for not being a native english speaker
2013-12-09 22:25:27 +04:00
Cheridan
06aedac73d Merge pull request #1960 from Ikarrus/voteresults
Detailed Vote Results
2013-12-09 10:21:26 -08: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