Commit Graph

4458 Commits

Author SHA1 Message Date
Ergovisavi bb101e80d4 Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-03-19 18:29:10 -07:00
Ergovisavi 57fe8ea3f4 Various mineral/material standardizations, minor mob changes 2014-03-19 18:28:56 -07:00
VistaPOWA 2173f8d403 Adds the Cyborg module into the messages received by the AI
It just puts the prefix of the borg into the $job var that is handled
internally by NTSL.
Also adds a var for the designation of the borg, it's kind of a
read-only variable that makes it fun & easy to get a cyborg's current
module without istyping.

Refactors the cyborg naming code a bit.

Removes additional fun (changes not shown in PR overview, 4317483141
counts of fun removed)
2014-03-19 22:56:06 +01:00
ikarrus 0fbafdb2db Added a notice for module changes as well. 2014-03-19 09:07:43 -06:00
ikarrus c891362dd3 Included fixing cyborg camera names not updating when reclassed or renamed by admins 2014-03-18 23:07:48 -06:00
ikarrus 87f85e7073 Added tracking links to the notices 2014-03-18 22:57:14 -06:00
ikarrus 0015be8d74 AIs are notified when a cyborg is slaved to it
Includes:
-Roundstart cyborgs
-New cyborgs
-Reclassified cyborgs
-Cyborgs when the AI wire is pulsed
2014-03-18 22:25:07 -06:00
ikarrus d97e7d84aa Allows roundstart cyborgs to select their own name
But only if the option is enabled in the server config.

Credit to Neerti for originally coding this.
2014-03-18 21:22:51 -06:00
Jordie0608 a5a9c2fd68 Changed mousetrapbox desc to span 2014-03-18 15:08:49 +11:00
Jordie 33e6f3f3c8 Screw off crowbar_red leave me alone 2014-03-18 11:29:46 +11:00
Jordie 3268033ba6 Hitsound for multitool 2014-03-18 11:28:47 +11:00
Jordie 36f6571b56 Hitsound for wirecutters 2014-03-18 11:24:06 +11:00
Giacomand cc4dd68bdf Added a new gravity generator which will produce gravity for the station.
Sprites by Ausop, which he posted in his sprite thread.

The gravity generator is very sturdy, as it is almost indestructible, but explosions can break it and it will need repairs.
Changed C4 to stop del()'ing and instead will only use ex_act().
Added an interact_offline variable for machines that will allow you to interact with them even if they are depowered. The gravity generator only uses this at the moment.

Removed the stun that people get when gravity changes.
Shuttles have gravity still.

Added a gravity generator room to the west of Engineering. It is very secure, with a foyer and requiring CE or Captain access. There are instructions on the table for repairing and enabling/disabling the machine.
2014-03-15 16:59:48 +00:00
Cheridan 4e5d757726 Merge pull request #3064 from Rockdtben/removeTLEComments
Removing TLE comment stamps and other useless comments
2014-03-14 15:40:27 -05:00
Cheridan 16994a1ae2 Merge pull request #3057 from Rockdtben/removeComments
Removed some of my useless comments from years ago.
2014-03-13 11:14:42 -05:00
Rockdtben a034e41f25 Removing TLE comment stamps and useless comments 2014-03-13 08:25:28 -05:00
Razharas 13454a78b2 Merge pull request #3054 from Limeliz/patch-2
Fixing JMP-link in asay for C4 planting
2014-03-12 22:35:01 -07:00
Razharas eca26b70da Merge pull request #3049 from RandomMarine/dnainjectorupgrades
Reduces DNA injector radiation based on its origin's upgraded parts.
2014-03-12 22:34:01 -07:00
Rockdtben 6eeeb1e5fe Removed some useless comments from years ago. 2014-03-12 07:59:34 -05:00
Emil 59e5e4294f Fixing JMP-href in asay for C4 planting
The JMP-link in the message_admins() when planting C4 on walls/doors etc always teleported admins to 0,0,0. It has been fixed now.
2014-03-12 05:24:12 +01:00
Cheridan f7337f1aa9 Merge pull request #3014 from fleure/tanks
Added atmos and jani watertanks, changed nozzle types [MAP]
2014-03-11 21:24:27 -05:00
RandomMarine c03052aed8 DNA injectors get DNA scanner's damage_coeff. 2014-03-11 09:23:41 -07:00
Rockdtben 83334f07be Merge pull request #3041 from hornygranny/balancepass
Buffs stun baton + classic baton
2014-03-10 20:54:25 -05:00
fleure b6e7155a24 Changed janitor and atmos tanks slightly 2014-03-10 20:27:21 +00:00
Hornygranny 02b8288589 Stun baton buffed, classic baton buffed 2014-03-09 16:46:55 -07:00
Hornygranny 4391b132c7 Revert "Increases most stuns 40% in length (now 7, up from 5, which was down from 10)"
This reverts commit d550b3491b.
2014-03-09 16:44:19 -07:00
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
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
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
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
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
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