Commit Graph

4458 Commits

Author SHA1 Message Date
Firecage dabe951f56 Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-04-01 12:09:26 +02:00
Jordie0608 79746e115f Wooden Walls 2014-04-01 18:03:02 +11:00
Aranclanos 6c1150dca3 Merge pull request #3143 from Malkevin/saccult
Sacrifice Cult
2014-04-01 02:18:39 -03:00
Firecage bf3ad41e6d Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-04-01 06:45:10 +02:00
Cheridan 5fce1835b2 Merge pull request #3144 from Ikarrus/borgdebug
Debugging Cyborgs during Construction
2014-03-31 18:48:50 -05:00
MrStonedOne 6553980059 Fixes admin message spam, should only warn the admins once.
Fix for #3143
2014-03-31 14:42:47 -07:00
Malkevin 0725ba44a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 2014-03-31 22:17:24 +01:00
Firecage cd3773450b Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-03-31 20:56:34 +02:00
fleure cccb3dcf76 Merge pull request #3226 from Giacom/syndicate_fab
Syndicate Suit Fashion
2014-03-31 19:35:45 +01:00
Firecage 79797afb6a Merge branch 'master' of git://github.com/tgstation/-tg-station.git 2014-03-31 18:53:02 +02:00
Razharas d1fbcf2457 Merge pull request #3227 from fleure/tankfix
Watertank nozzles no longer delete
2014-03-31 09:48:57 -07:00
Firecage af00fd14bf Mimepack
This is a simple backpack for the mime.
2014-03-31 17:49:40 +02:00
MrPerson 2991dd72c9 More qdel() changes.
Move all atom/Destroy() behavior to atom/movable/Destroy() so turf/areas that get qdel()'d just get del()'d like they're supposed to. Also do tag = null, which should make more things GC.
Make cameras GC correctly and some misc grammar fixes.
Make smoke grenades GC.
Tell camera bugs to del() because I'm not working on complex behavior for one item.
2014-03-31 01:11:37 -07:00
GunHog f11294fdbf Adds a name for AI Private in radio.dm. 2014-03-31 00:48:58 -05:00
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
Malkevin c3552606f1 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
Conflicts:
	code/modules/mob/mob.dm
2014-03-29 16:59:14 +00:00
Razharas 6cb3ae5183 Revert "Merge pull request #3142 from Alek2ander/master"
This reverts commit 6f9b58abce, reversing
changes made to eda7110a23.

Im so sorry aran, so sorry
2014-03-29 18:02:54 +04:00
Razharas 6f9b58abce Merge pull request #3142 from Alek2ander/master
pAI remote computer control
2014-03-29 06:18:22 -07: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
Alek2ander 358ecf7e6a Merge branch 'master' of https://github.com/tgstation/-tg-station into tgstation-master
Conflicts:
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/telecrystalconsoles.dm
2014-03-27 18:31:11 +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
ikarrus c41c80591a Some minor fixes 2014-03-26 12:38:30 -06: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
ikarrus fe8481331c -Added option to force sync to a specific AI
-Removed option to force a module to load
-Fixed pulsing a cyborg's AI wire not letting it reselect an AI to sync to.
-Resolved Conflicts
2014-03-25 14:07:01 -06:00
Aranclanos 9e9dc34ecf Merge pull request #3163 from Mloc/tg-eol
proper crlf forcing
2014-03-24 22:47:13 -03: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
Alek2ander 223e5f7478 Arcades, overlays and Git being evil
Added the most important damn checks of this entire PR that got eaten by
Git when I synced
Added a visual indication of a pAI being paired with a computer - a tiny
blue light at the bottom
Forbid to pair with computers that have non-standard icons, except the
arcade machine.
When the arcade is emagged, if the pAI loses, it will explode like a
detonated PDA. If it's slotted into a PDA, it will explode with it.
Severs connection if the pAI and the computer are on different z-levels
2014-03-23 12:39:13 +04:00
Ikarrus d21fa447b4 added a span class 2014-03-22 16:43:50 -06:00
ikarrus 47890f4a5d Prevented humans from being able to create a non-malf cyborg during malfunction rounds without a secondary AI to sync to. 2014-03-22 16:39:43 -06:00
ikarrus 6a64071e3f Debugging Cyborgs during Construction
-Using a multitool on a completed cyborg body before inserting the MMI will allow you to set various settings to be transferred to the new cyborg mob
-Removed naming via pens. Naming is now done via debugging.
-Allows roboticists to force a module to load
-Allows roboticists to block ai syncinc and law syncing
-Allows roboticists to toggle the initial lockdown and panel lock state

I also rewrote NEO's note on cyborg objectives since he's never going to fix it now. IT'S A FEATURE.
2014-03-22 16:03:43 -06: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
VistaPOWA 5c5f0e5163 Merge remote-tracking branch 'upstream/master' into cyborg_module_in_telecomms 2014-03-22 13:54:57 +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
ikarrus fdede7e73a Resolved conflicts and added an AI notice when a cyborg renames itself.
Also fixes the comments of the BORG_RENAME config
2014-03-20 09:38:31 -06:00
fleure 61a4ed7a4d Merge pull request #3114 from Ikarrus/borgname
Allows roundstart cyborgs to select their own name
2014-03-20 11:17:39 +00:00
Jordie f32f81d5b5 Hitsound for rods 2014-03-20 15:43:39 +11:00