Commit Graph

7317 Commits

Author SHA1 Message Date
Alek2ander 5ae69c25e6 VV now allows read-only stuff without edit perm
Also removes links you do not have permissions to use
2013-12-12 23:22:11 +03: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
JJRcop c80efcc0f0 Adds breaks to some loops in case there is more than one pod.
Shouldn't happen, but Murphy's law.
2013-12-11 10:50:03 -05:00
Jordie0608 87b5161e28 Removed incorrect speak, changed see and hear emotes 2013-12-11 17:33:59 +11:00
Jordie0608 9197bff4dd Added reindeer hats for humans and corgis 2013-12-11 16:11:01 +11:00
Giacomand 92480d60b4 Fixes the screen shaking from having your camera get stuck on a turf. 2013-12-11 04:17:46 +00:00
Kyrah Abattoir 3496dc4e0a Merge branch 'master' into ItemNameFixingRound3 2013-12-10 17:32:45 +01: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
JJRcop db94963933 Adds functionality to empty a transit pod or put mobs in one
Clicking on a transit station with a grab or harm intent will cause you to attempt to empty the contents of the pod onto the floor, takes 4 seconds

Clicking on a transit station with a grab item in the aggressive state or above will cause you to attempt to stuff the grabbed mob into the pod, takes 6 seconds
EDIT1: Caused stuffing people in pods to stun them for 5 seconds to assist transport of captured persons
2013-12-09 21:02:50 -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
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 20b1c54ec4 Merge pull request #1999 from Aranclanos/commitpls
Makes the code compile
2013-12-08 11:38:44 -08:00
Cheridan f96755857d The plant that grows .357 revolvers. 2013-12-08 13:32:33 -06:00
Aranclanos de11cd2934 for extra prettiness, the (x,y,z) coordinates on the game logs of transfer valves no longer have spaces between them. 2013-12-08 16:10:58 -03:00
Aranclanos cd9778c7db Fixes the code not compiling. I blame myself. And everyone else. 2013-12-08 16:08:37 -03:00
ikarrus 8cd9300800 Removed percentages and added a "Did not vote" count for custom votes. (Non-voters get automatically added to status quo option in non-custom votes) 2013-12-08 11:34:12 -07: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
Ikarrus e31f8b6afe Added feedback when anchoring fails 2013-12-08 10:33:53 -07: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
Razharas 85993256c3 Damn grammer
Can't
2013-12-08 18:34:18 +04:00
Razharas d43a65c49e Adds tips when setting/unsetting stings
Now its a bit more obvious how to use new ones
2013-12-08 18:27:26 +04: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
Aranclanos 124e1b7019 Merge pull request #1881 from AndroidSFV/checkmobfacingproc
Compare mob facing helper proc [Review and discuss before merge]
2013-12-08 01:06:30 -08:00
Aranclanos bf3c617cea Merge branch 'master' of https://github.com/tgstation/-tg-station into bombchange 2013-12-08 05:41:59 -03:00
Aranclanos 15c4ffdb57 Fixes the href links on the game logs related to syndicate bombs 2013-12-08 05:40:50 -03:00