Commit Graph

7317 Commits

Author SHA1 Message Date
AndroidSFV 14e26a64a2 Removed the pAI check. Dont entirely agree with it, but I am a team player~ 2013-12-07 13:41:02 -06:00
VistaPOWA 1041d7081d Replaces 'aluminum' with 'aluminium'.
Hopefully there won't be a grammar war because of this.
2013-12-07 14:42:25 +01:00
Giacom c1304ef0c8 Merge pull request #1971 from adrix89/Crate_Explostion
Fixed crate not blowing up properly.
2013-12-07 04:54:09 -08:00
Perakp ce9f29fb86 Applied logic to portable generator deconstruction. 2013-12-07 09:27:56 +02:00
Perakp b8a7957a22 Adds deconstruction for DNA scanner and cloning pod.
Adding wires to a machine frame uses one unit of wire.
Wires returned from deconstructing return 1 unit of wire.
Fixes issue #1001
2013-12-07 08:55:07 +02:00
Incoming ca920321ae Merge branch 'master' of https://github.com/tgstation/-tg-station into bombchange
Conflicts:
	maps/tgstation.2.1.2.dmm
2013-12-06 12:20:35 -05:00
Perakp e4c3ca5fb8 Janiborgs can no longer place their mop, light replacer or trash bag in the janicart. Fixes #1954
Language fix "this the" -> "the" in storage.dm
2013-12-06 13:00:11 +02:00
Giacomand eb3f07e538 Added anonus' rainbow ghost icons. 2013-12-05 18:34:24 +00:00
Aranclanos 870d23ccf4 Merge branch 'icons' of https://github.com/Jordie0608/-tg-station into icons
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/weapons.dmi
2013-12-05 08:32:53 -03:00
Aranclanos a0a01e840e Removed some items from the spawn_forbidden list of sandbox mode. That list is not for potential "grieff" items. 2013-12-05 08:19:52 -03:00
Aranclanos ec79981b3a Merge branch 'sandbox' of https://github.com/cookingboy3/-tg-station into sandbox 2013-12-05 07:52:31 -03:00
Aranclanos 2a07f06ba8 Merge pull request #1932 from Giacom/op_meteor2
Tweaked meteors to stop playing unnecessary sounds.
2013-12-05 02:46:51 -08:00
Aranclanos f6f9f0f050 Removed a leftlover in click code and fixed changeling stings because they weren't working why aren't they working why don't they work, I keep asking that, it's a PR about changelings stings, but they don't work, why they don't work little black ball of destiny, I just want to know why they don't work on the PR that says that they will work, why why why 2013-12-05 07:35:29 -03:00
Aranclanos a4a13681f3 Merge branch 'master' of https://github.com/Razharas/-tg-station into ImGonnaStingYa
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
2013-12-05 07:01:09 -03:00
cookingboy3 42d5cd529f Infinite cell button fix, more banned items. 2013-12-04 18:28:11 -08:00
Incoming 4ac8a4164c Summon Magic / Charge / Wands&Staffs / One time spellbooks / New Apprentice
---

Summon Magic:

This new wizard spell works much like summon guns except it instead brings the crew magical tools and weapons. There are preexisting artifacts (minus some that would cause huge confusion/balance issues) as well as new spellbooks, wands, and a staff. The chance of survivor antag is the same as summon guns.

---

Charge:

This new spell allows for the recharging of otherwise unrefillable wands, but there's a heavy chance that the total number of charges will decrease with each casting until eventually they're impossible to keep recharging. As a bonus the charge spell can also be used to charge batteries and things that run on batteries (such as energy weapons). This carries the same max charge weardown penalties however. Lastly this spell allows a wizard to charge other wizards with a grab, reseting their spell cooldown. They cannot use it to charge themselves. It has a 60 second cooldown.

The wizard cannot buy this spell himself, it only comes randomly to the crew during Summon Magic and with the new apprentice loadout.

---

Wands&Staffs:

Magic weapons have been overhauled into their own catagory so there won't be any more weirdness with batteries in staves or apparent magic resistance on things that reflect energy weapons.

Wands have been added, these wands come precharged with a number of shots that can be fired off at their leasure but cannot be recharged once emptied (unless the charge spell is used). They come in a varity of exciting flavors:

*Death: Slays instantly but has very few shots (1 to 3)
*Resurrection: Revives and/or heals instantly but has very few shots (1 to 3)
*Polymorph: Same function as the staff of change
*Teleport: Weaponized blink spell that doesn't respect space tiles and can also warp away machinery or items (but not turf)
*Door Creation: Puts easy access wooden doors in walls
*Fireball: Same function (but slightly lower damage) as the fireball spell
*Nothing: Lame and useless

Wands can also be used on the user (unlike staves) by clicking on them. Warning messages have been added to a few wands so people don't accidentally zap themselves with the wand of death unless they really want to.

Wands cannot be aquired by the wizard directly, and are only spawned during castings of summon magic.

There is also a new staff, the staff of healing, which works as a recharging version of the wand of resurrection. The new apprentice starts with one of these, and they can also be found during summon magic. The wizard cannot purchase it directly, and as a stave he could not use it on himself anyways.

---

One time spellbooks:

Found exclusively in summon magic are one time use spellbooks that can teach any player a robeless spell. Once read the book vanishes.

Books come in the following flavors:
*fireball
*smoke
*blind
*mindswap
*forcewall
*knock
*curse of the horsemen
*charge (described above)

---

New apprentice:

A fourth loadout for apprentice wizards has been added. This wizard is intended as a support role and comes with forcewall (for cover) and charge (used to keep him and the wizard well stocked in laser weaponry or to restore the wizard's cooldowns). It also comes equiped with a free Staff of Healing for keeping the wizard alive. Shoot the medic first folks.
2013-12-04 21:00:36 -05:00
MrPerson b20b7d3bf5 Merge pull request #1955 from Ikarrus/portaoverlay
Fixed inverted portaflasher overlay state
2013-12-04 17:13:49 -08:00
KazeEspada 4b52884913 Fixes a potential issue with lootspawners who have lootcounts longer than their loot list and lootdoubles not enabled. 2013-12-04 18:10:43 -07:00
Rolan7 530dd03286 Making astroturf and sandstone now automatically stacks all the produced items. 2013-12-04 18:44:49 -05:00
Adrinus 482eb7a041 Made the parent arcade machine a "randomized" arcade. Mapper can place the parent, and it will auto-magically become one of the existing arcade machines. This code should work for any future arcade machines. 2013-12-04 13:14:04 -05:00
ikarrus dce8abbd06 Input window will now have the current admin notice displayed when you go edit it. 2013-12-04 08:13:56 -07:00
adrix89 49282cd604 Fixed not blowing up properly.
Use closet ex_act instead.
2013-12-04 10:03:12 +02:00
Perakp a9d6f493dc Deleted checks from alien_embryo
No double checks.
2013-12-04 09:23:21 +02:00
ikarrus 5f15506e38 Admin Notices
Lets admins set temporary notices that will last until the end of the round.
* All players that join the server will see this notice.
* Anyone can check it using the Adminnotice verb
* Also adds the motd verb that can be used to check the server's message of the day

The intention of this is to make it easier for admins and server hosts to run special events.
2013-12-03 22:25:28 -07:00
ikarrus ae4d023b65 All votes have detailed results now. 2013-12-03 20:36:06 -07:00
Adrinus 12b43c997e Split up the arcade machines for future expansion. Added Game-Over explanations. A few tweaks and fixes. 2013-12-03 20:12:46 -05:00
Adrinus 26139a0402 Made the Orion Trail machine a subclass of arcade. Added designs for its circuit board. 2013-12-03 19:19:51 -05:00
Adrinus 4600375ae2 Adds a new Arcade Machine. 2013-12-03 18:22:10 -05:00
Perakp 4c9405641a Changed bitflag 'or' to boolean
| != ||
2013-12-03 23:25:44 +02:00
Emil 36f1ba5510 Removing href-tags from log_game in say.dm 2013-12-03 21:43:26 +01:00
Emil e2a6628aec Removing href-tags from log_game in grenade.dm
Cleaning up after Ikarrus @ 2f92f67a
2013-12-03 21:33:58 +01:00
Giacom 97c48e6fbe Merge pull request #1923 from Aranclanos/ItWasMyPromiseCarnie
Bye NOBLOODY, I won't miss you
2013-12-03 12:06:44 -08:00
Emil 72e16e4482 Removing href-tags from log_game in transfer_valve.dm
Not sure I'm doing this the best way, but I couldn't come up with a cleaner way. Suggestions are welcome!
2013-12-03 16:54:38 +01:00
ikarrus 1df342954a Detailed Custom Vote Results
https://dl.dropboxusercontent.com/u/831776/bossofme.png

Custom vote results will show how many votes each option recieved, and as a percentage of server population.
2013-12-03 08:42:24 -07:00
cookingboy3 d687e6feac removed a comment I missed 2013-12-03 07:14:29 -08:00
cookingboy3 446728d45d removed dev comments, added changelog 2013-12-03 06:56:32 -08:00
Perakp d9f5224646 Changed Del to del
Proc names are case sensitive
2013-12-03 13:15:19 +02:00
Emil a56336a621 Update grenade_launcher.dm
Removed href-tags from log_game and corrected the log message.
2013-12-03 09:35:32 +01:00
cookingboy3 445f2870dc Sandbox modification 2013-12-02 20:59:21 -08:00
ikarrus d0bded382e Removed depreciated code from comments 2013-12-02 18:35:13 -07:00
ikarrus 25de3084bd Fixed inverted portaflasher overlay state
The light should be on while bolted, not the other way around.
2013-12-02 18:31:54 -07:00
Aranclanos 397af68100 Merge pull request #1946 from Limeliz/master
Removes more href-tags from game logs.
2013-12-02 13:54:42 -08:00
Giacom 8d1a0fd552 Merge pull request #1943 from YotaXP/Fixes-1867
Fixes Issue #1867
2013-12-02 13:44:45 -08:00
Giacomand 9d49d997fb Removed spawn() 2013-12-02 21:12:24 +00:00
Aranclanos fe6f4ff0df Merge pull request #1945 from Giacom/reduce_getturf
Reduces the amount of get_turf calls.
2013-12-02 12:59:04 -08:00
Aranclanos d9fcb1b4e4 Merge pull request #1933 from Giacom/da_fix_the_revenge
Fixes Double Agents not correctly getting the right traitor title before being set as a target.
2013-12-02 12:54:17 -08:00
Razharas d920dbac34 And i forgot something again
Goddamn this low attention span
2013-12-03 00:52:17 +04:00
Razharas eb8b23b873 Fixed some issues
Removed all item stings legacy
Removed game balance changes
Moved stings handling to AltClickOn, added the dead check i forgot to
add
Reverted monkeyizing keeping items from previous form
Fixed the grammar in the comments
2013-12-03 00:45:05 +04:00
Aranclanos d4a4a817d4 Merge pull request #1922 from TZK13/Mushroom-Adjustments
Adjustments to mushrooms
2013-12-02 12:41:34 -08:00
Giacomand 088cb5afd3 Merge branch 'master' of https://github.com/tgstation/-tg-station into virus_tweak
Resolved Conflicts:
	html/changelog.html
2013-12-02 20:20:35 +00:00