Commit Graph

2954 Commits

Author SHA1 Message Date
Miauw dc9ead6575 Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
Conflicts:
	code/_onclick/telekinesis.dm
	code/game/sound.dm
2014-03-30 20:48:03 +02:00
Giacomand 96912ce8dc Changed the replica suit/helmet to the black/red version.
Changed the description on the uplink datum.
Made all the suit/helmet names lowercase for all the different versions.
Changed the max_w_class to allow the suit to be inserted, won't allow anything else to be inserted due to the can_hold list not being empty.
2014-03-29 12:42:23 +00:00
fleure c55ddd9d70 Watertank nozzles no longer delete 2014-03-29 12:35:58 +00:00
Giacomand 9fb84160c8 Replaced all the red syndicate space suits with the red/black version, including the uplink item. It looks cooler.
You can now put the syndicate suit back into the box it came in.
Gave the DJ Station the orange syndicate suit, looks very nice.
Replaced the syndicate suit in the derelict's singularity engine with the yellow/black engie version.
Replaced the other syndicate suit in the derelict with the red/black version.
Added a red/black space suit to the abandoned mining station, inside the resin corridor, along with a syndicate toolbox.
Moved the xeno suit to the hydro room, on the abandoned mining station. It looked out of place out in the open.
Moved the SWAT helmet on the derelict to the derelict armoury.
2014-03-29 12:00:23 +00:00
Giacomand f2bfa3f5d4 Renamed maglite to seclite.
Refactor'd can_hold and cant_hold to use type paths instead of strings.
Removed an undefined object from the medical belt's can_hold list.
2014-03-29 11:10:35 +00:00
Giacomand cc1d87afcf Adds the maglite. Security spawns with it in their sec belts. They have a decent force value and are a little better than the common flashlight. Sprites by Nienhaus. Can be held in the sec belt and the armour vest. 2014-03-29 00:54:50 +00:00
Malkevin 3ff519cefc Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
Conflicts:
	code/modules/mob/mob.dm
2014-03-28 10:51:48 +00:00
YotaXP febfa4d1e5 Merge branch 'qdel-with-datums'
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/controllers/garbage.dm
	code/game/atoms.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/modules/mob/mob.dm
2014-03-27 21:46:53 -04:00
Malkevin cd6c1272ad Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 2014-03-27 13:18:46 +00:00
Ergovisavi d55d72f049 Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-03-26 18:14:48 -07:00
Malkevin 990ed20873 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
Conflicts:
	code/modules/mob/mob.dm
2014-03-26 18:38:07 +00:00
Incoming e5f0165d0d Merge branch 'master' of https://github.com/tgstation/-tg-station into avoiddrama_codemagic
Conflicts:
	code/datums/spells/charge.dm
	code/modules/projectiles/ammunition/special.dm
	code/modules/projectiles/guns/magic/staff.dm
2014-03-26 13:03:12 -04:00
Mloc-Hibernia 8af8a43d6f Initial pass to convert LF to CRLF
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-03-24 08:53:40 +00:00
YotaXP 3656217c29 Modified qdel() to accept any datum.
The garbage controller no longer bothers nulling out every variable on destroyed objects.
An object can opt to not be collected by returning true from Destroy().  Useful for pools or other edge cases.
Fixed boxes not being collected, along with a couple other things.
Turfs will not be monitored for collection.
generate_ion_law() is no longer a /datum proc, and I am an admin in the repo.  Deal with it.
2014-03-24 00:10:43 -04:00
Malkevin 542da7d73b Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/wizard/soulstone.dm
2014-03-22 21:01:09 +00:00
Miauw a80dd4df0f Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
2014-03-22 17:42:07 +01:00
MrPerson ee716586b9 GEE THANKS GIA FOR MORE CONFLICTS (gravitygen changes to c4 vs qdel)
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r

Conflicts:
	code/game/objects/items/weapons/explosives.dm
2014-03-21 19:04:51 -07:00
Razharas 4c4cadb48c Merge pull request #3086 from Giacom/gravity_generator
[MAP] Added a new gravity generator which will produce gravity for the station.
2014-03-21 14:06:40 -07:00
MrPerson 6930283efc Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
Conflicts:
	code/game/gamemodes/changeling/changeling_mutations.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/research/server.dm
2014-03-21 03:05:39 -07:00
Malkevin 5665966c94 cult.dm - made the objectives always be declared in ticker.mode
changed the var name from objectives to cult_objectives

cultists hitting mobs (and only mobs) will convert any holy water to unholy water

trying to summon narsie when shes not an objective will dose all the summoners with hell water

chaplain with his bible can purify the unholy water in a container

wrote the sac act for corgis - this will cause !!FUN!! to the sacrificer

Holy water will deconvert cultists now, takes around 2 minutes

Unholy water generally buffs cultists, but causes brain damage. Its very poisonous to non-cultists.

Hell water - this is a punishment reagent, amongst other bad affects chiefy it (re)sets people on fire

Misc: Fixed hyperzine being double consumed.
2014-03-21 00:03:42 +00:00
Cheridan d2021e1bcd Merge pull request #3107 from Jordie0608/dancefloorisbetterthantheprancefloor
Fixes wirecutters and multitools lacking attack sounds
2014-03-20 11:19:14 -05:00
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
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 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
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
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
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
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
Razharas 5e61e9ea76 Merge pull request #2960 from hornygranny/balancepass
combat rebalance tweaks
2014-03-03 17:59:39 -08:00