Commit Graph

4880 Commits

Author SHA1 Message Date
Cheridan 19a9717ece Merge pull request #3010 from fleure/firtree
Fixed typo in Tyrant AI lawset
2014-03-09 15:15:21 -05:00
Miauw 8c172733a8 Standardizes and expands the warning() and error() procs. 2014-03-09 18:08:19 +01:00
MrPerson 6b29fecda1 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/rechargestation.dm
	code/game/machinery/turrets.dm
	code/game/objects/structures/crates_lockers/closets.dm
	code/modules/research/circuitprinter.dm
2014-03-08 22:03:03 -08:00
Incoming 5c3f7777b9 Magic Mania 1.5: Big Trouble in Little Boxstation
---

A Few New Wizard Items

Staff of Chaos: Shoots random magic bolts. Charges faster and can hold more shots than other staves.
Staff of Door Creation: Works the same as the wand of door creation. There is apparently demand for this! Charges faster and can hold more shots than other staves.
Wand Assortment: A belt that comes of one of each useful wand, generated with the highest number of shots possible.

---

Cleaning Up the Spellbook

The spellbook was getting REALLY long, so it's been segmented into pages for spells, items, and one time use spells (aka the fun page). The spellbook also highlights the fact that you can upgrade spells better now.

---

Summon Magic Rebalancing

There's now a new catagory of magic items that are especially potent. These have a very low chance of showing up now and only one can spawn during a casting of summon magic, if one even spawns at all. The person who gets it is not guarenteed to be a surivor either.

In this category: Staff of Animation, Staff of Change, Staff of Chaos, Wand Assortment, Contract of Apprenticeship.

Additionally the staff of door creation is now in the normal pool and the staff of change is no longer in the normal pool.

---

Misc Stuff

Adds Bats and Goats to the staff of change.
Changes the charge spell so if you charge something that can charge on its own there's no chance of degradation.
2014-03-08 17:30:40 -05:00
Steelpoint 55beb8c8b3 TakeTwo 2014-03-08 23:50:15 +08:00
Ergovisavi 062f368ce0 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss 2014-03-07 04:24:51 -08:00
Hornygranny d550b3491b Increases most stuns 40% in length (now 7, up from 5, which was down from 10) 2014-03-06 22:56:22 -08:00
fleure 026c991b95 Added atmos and jani watertanks, changed nozzle types 2014-03-07 01:13:19 +00:00
Fleure 4914ee6dc4 Fixed typo in Tyrant AI lawset 2014-03-06 17:18:57 +00:00
Aranclanos fb64ae9a41 the vending refill objects won't runtime anymore at roundstart if they were placed in the map 2014-03-06 10:20:48 -03:00
Ergovisavi a3ce04c000 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss
Item attack changes
2014-03-06 03:17:02 -08:00
Aranclanos ad3c76ef31 Grabs won't runtime anymore on lockers 2014-03-05 21:20:06 -03:00
Cheridan a2fb8bc3eb Merge pull request #2983 from ChuckTheSheep/TC-Green-Text
Fix  for Nuker's TC Green Text.
2014-03-05 00:18:49 -06:00
Razharas c548df264b Conflict fix 2014-03-05 06:30:29 +04:00
ChuckTheSheep f4e2d30749 Made uplink_owner key rather than name
Had issues with clowns/mimes/nuke ops due to name changes.
2014-03-04 14:55:03 -05:00
Incoming 2159f93b63 Moves the code for returning an animate statue to flesh to the statue structure from the statue mob. It will be less checked for here, as it will only look when the timer runs out on the statue structure.
Adds a message to getting unstoned so shitlers don't try to argue that they're still antags.
2014-03-04 13:55:42 -05:00
Cheridan 5d30d1923e Merge pull request #2970 from Ergovisavi/bangarang
Flashbang tweaks
2014-03-04 02:59:10 -06:00
MrSnapwalk 00fd755b8c Automerge Fix 2: Electric Boogaloo
This is why we can't have nice things.
2014-03-03 20:12:30 -06:00
Razharas 5e61e9ea76 Merge pull request #2960 from hornygranny/balancepass
combat rebalance tweaks
2014-03-03 17:59:39 -08:00
MrPerson 80a7a2abb4 Replaced a few more Del() and del() calls
Removed cigarette related reagent deleting. It's already done in atom/Destroy()!
2014-03-03 04:51:09 -08:00
Ergovisavi a68a51ac52 Flashbangs will now stun borgs. If you are holding the flashbang on your person somehow, or are in the exact tile that the flashbang is on, your eye/ear protection is void and you take a significantly longer stun than you would otherwise. Flashbangs have a better falloff check than they did previously. 2014-03-02 23:48:46 -08:00
MrPerson 3c58091437 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel
Hopefully nothing went wrong but you never know.

Conflicts:
	code/FEA/FEA_fire.dm
	code/controllers/supply_shuttle.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/drying_rack.dm
	code/modules/hydroponics/hydroponics.dm
	code/modules/projectiles/projectile/magic.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_dispenser.dm
2014-03-02 21:39:27 -08:00
Razharas f3ccaa5936 Merge conflicts fix 2014-03-03 05:42:31 +04:00
Ergovisavi 3a96098d55 Merge branch 'master' of https://github.com/tgstation/-tg-station into ore_redemp_fixes
Also fixed some weird autodrobe runtime on startup
2014-03-02 17:07:24 -08:00
MrSnapwalk 789134d8f2 Automerge fix
Fixing the conflicts preventing an automerge.
2014-03-02 17:03:35 -06:00
MrSnapwalk b03fc3d645 More suits, and more fixes.
More suits by Nienhaus, and a few fixes for the contents of lockers.
Also added a dermal armor patch to the Captain's locker, for added head
protection without the downside of helmet-hair.
2014-03-02 16:10:08 -06:00
Razharas a0a4ee8292 Merge pull request #2928 from Incoming5643/sadstuckinwall
No more getting stuck in the wall
2014-03-02 13:42:55 -08:00
Razharas 2aa4f2728f Merge pull request #2912 from Miauw62/ihavenoideawhati'mdoing
Fixes some misc NODROP stuff I think
2014-03-02 13:30:23 -08:00
Razharas 6b14c42c41 Merge pull request #2898 from ChuckTheSheep/TC-Green-Text
TC use count appears on round end
2014-03-02 13:02:28 -08:00
Razharas 3cb5c7380f Merge pull request #2894 from ChuckTheSheep/Morgue-Slab-Fix
Fixes an oversight in my slab code + New recursive mob check
2014-03-02 12:42:30 -08:00
Ergovisavi d2917b7992 Fixes an issue with teleportation scrolls and mining vouchers that allow you to gain unlimited uses from them. 2014-03-02 05:00:57 -08:00
Hornygranny 20901b24d0 Increases cuffing speed to match secborgs, help with shorter stuns 2014-03-01 21:00:39 -08:00
MrSnapwalk 34931dc227 Item sprites!
Adds generic item sprites to all items added.
2014-03-01 20:19:32 -06:00
MrSnapwalk b6a60a07b4 Makes fancy items obtainable.
Adds a formal-wear crate, makes lawyers have laceup shoes, adds a better
sprite for the memorizer, adds the formal uniforms to each job's closet,
and fixes a typo in the object name of the black jacket. [FORMALNESS
INTENSIFIES]
2014-03-01 19:44:22 -06:00
Ergovisavi ac269baacb Fixes bullet_act not checking for damagetype on many, many objects.
Replaces Holodamage with Stamina damage, if your stamina damage exceeds your current health, you get weaken(5)'d. Stamina heals itself slowly over time.
Makes the hallucination enemies deal more stamina damage than they did holodamage, but stamina damage heals now so it's mostly for just seeming threatening at the moment.
Adds the Disabler, a gun that does stamina damage. It has a range of your screen, but no more. Adds a disabler crate to cargo (security lock)
Fixes Lasertag ED209's because they were busted as shit
Reduces ED209's view range to 9 from 12, which was several times longer than your screen view, now is only a little bit more
Lastertag now does stamina damage instead of an instant stun for that GRITTY LASERTAG EXPERIENCE
2014-03-01 16:39:22 -08:00
Razharas 2fd5557682 Conflict fix 2014-03-02 04:14:32 +04:00
MrSnapwalk 39c155c03a Classy Outfits
Adds formal uniforms, a black tango dress, and a professional black suit
(with added Memorizer for maximum CIA spookyness). To do: make this
stuff orderable from cargo, and add some of it to the lawyer's closet.
2014-03-01 00:30:05 -06:00
Aranclanos 1aff9034d9 Merge pull request #2943 from Aranclanos/ServerCrash
Server crash fix.
2014-02-28 19:42:27 -02:00
Aranclanos b565b2125e Server crash fix. 2014-02-28 13:20:15 -03:00
hornygranny ac8763227b Slightly sped up cuffing to compensate 2014-02-27 11:07:43 -08:00
hornygranny c31647376e This is for discussion of things that need to be changed to move away from purely stun based combat. Please only comment if you have something to contribute, rather than just saying you like or dislike it.
Shoes do not increase your movement speed
Stun/weaken on basically everything reduced from 10+ to 5 ticks
Time to unbuckle/uncuff self halved
2014-02-27 10:56:06 -08:00
Incoming 09124ccf6b If a hand teleporter portal is forced to spawn on top of you (meaning you're completely encased in impassible material) you will automatically teleport with it. 2014-02-26 19:47:29 -05:00
Cheridan 011a78f478 Merge pull request #2902 from Miauw62/actualbranchnamesyounerd
Fixes NODROP not playing nice with tables.
2014-02-25 22:37:09 -06:00
Cheridan 004b005ab2 Merge pull request #2901 from Miauw62/aijgdiajgiojdaigjapgijsgdipjagiojaranisafagaidpjgiaopjgdoiadjgaipgjpijadgijagipjadijigpaijgdipajgdipajdgpiadjgpajgd
Fixed #2899 (NODROP and closets doing weird shit)
stop making retarded branch names miauw
2014-02-25 22:29:39 -06:00
Cheridan 5ec24c8613 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChuckTheSheep-Botany-Big-Booty-Twerk
Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm
	code/modules/reagents/Chemistry-Reagents.dm

resolved with Theirs, must manually reapply fixes
2014-02-25 19:39:26 -06:00
ChuckTheSheep 0bba6f4fae Merge remote-tracking branch 'upstream/master' into Morgue-Slab-Fix 2014-02-25 20:21:21 -05:00
ChuckTheSheep 21d621c049 Merge remote-tracking branch 'upstream/master' into TC-Green-Text 2014-02-25 20:19:32 -05:00
ChuckTheSheep 6cc3055714 Uses compiled list for uplinks 2014-02-25 17:53:30 -05:00
Miauw 82185a03c7 Makes NODROP items play a bit nicer with pockets. 2014-02-25 21:13:57 +01:00
Miauw 3d6a2ce74d Fixes some misc NODROP stuff I think (don't worry I did actually test) 2014-02-25 21:07:57 +01:00