Commit Graph

2696 Commits

Author SHA1 Message Date
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
79d255be20 Merge pull request #3203 from MrPerson/qdel_table
Make wrenching tables apart not drop the wrench
2014-03-29 06:24:23 -07:00
Razharas
6f9b58abce Merge pull request #3142 from Alek2ander/master
pAI remote computer control
2014-03-29 06:18:22 -07: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
Razharas
3000586e7b Merge pull request #3216 from Aranclanos/ClickDownRemoval2
Click cooldown removal take 2
2014-03-28 02:39:25 -07:00
Aranclanos
7bcb69ad88 Removes the click cooldown from almost everything, now it should be always be 0.1 seconds.
Ranged weapons and laser eyes have a cooldown of 0.4.
Grilles, windows, windoors, walls and blobs have a cooldown of 0.8.
Hitting mobs will also have a cooldown of 0.8.
Removes the unused USEDELAY flag.
2014-03-28 06:32:47 -03: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
MrPerson
481427a46f Make wrenching tables apart not drop the wrench 2014-03-26 20:34:08 -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
Aranclanos
211d1ec509 Merge pull request #3173 from MrPerson/cream_of_torium
Small rewrite of crematorium and morgue so they work right.
2014-03-26 03:35:55 -03:00
Cheridan
3187be3e51 Merge pull request #3111 from Ikarrus/seclocks
[MAP] Security Lockers Organization
2014-03-25 11:00:48 -05:00
MrPerson
52b24f3549 Merge branch 'master' of https://github.com/tgstation/-tg-station into cream_of_torium 2014-03-25 04:42:10 -07:00
Incoming
6b83a8d2e0 I am crying.
Merge branch 'master' of https://github.com/tgstation/-tg-station into toostat4tue

Conflicts:
	code/game/objects/structures/crates_lockers/closets/statue.dm
	code/modules/mob/living/simple_animal/hostile/statue.dm
	code/modules/projectiles/projectile/magic.dm
	tgstation.dme
2014-03-24 22:13:43 -04:00
Aranclanos
9e9dc34ecf Merge pull request #3163 from Mloc/tg-eol
proper crlf forcing
2014-03-24 22:47:13 -03:00
fleure
43a6e111c5 Merge pull request #3118 from VistaPOWA/cyborg_module_in_telecomms
Adds the Cyborg module into the messages received by the AI
2014-03-24 15:08:25 +00:00
MrPerson
41042d5efd Small rewrite of crematorium and morgue so they work right.
Only issue is that the damn things don't GC. Also lots of duplicate code between the two, still some other shittiness, but this is much better. I really just wanted to fix the bug where after usage you can't use em again until the tray gets deleted rather than GC'd.
On the plus side, they don't constantly make and delete trays every time someone opens them.

Also, and this is important, I uncommented the crematorium usage logging. It didn't runtime in testing so it should be good to go.
2014-03-24 04:01:27 -07: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
Incoming
bab77f2538 Merge branch 'master' of https://github.com/tgstation/-tg-station into toostat4tue
Conflicts:
	code/modules/projectiles/projectile/magic.dm
2014-03-23 12:08:33 -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
Aranclanos
64c2138aa5 Merge pull request #3108 from TZK13/Bluebay-2-Electric-Bloogaloo
[MAP] Bluebay 2: Electric Bloogaloo
2014-03-22 20:01:55 -03: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
VistaPOWA
5c5f0e5163 Merge remote-tracking branch 'upstream/master' into cyborg_module_in_telecomms 2014-03-22 13:54:57 +01:00
TZK13
aa7ae999bd Fixes map and dmi conflicts as well as the obj suits dmi. 2014-03-22 02:33:36 -05:00
MrPerson
2858bf1c18 Fix for changling powers arm blade and fleshy space suit.
More del(AM) -> qdel(AM) and Del() -> Destroy()
Fixes a terrible bug that would have meant players could only ghost once.
2014-03-21 22:26:50 -07: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
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
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
Cheridan
3eea5028a6 Merge pull request #3109 from Jordie0608/Childrenshouldntbeonaspacestationanyway
Fixes HTML code showing up on mousetrap box desc.
2014-03-19 10:50:43 -05: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
ikarrus
ad8a374e06 [MAP] Security Lockers Organization
-Moved spare HoS uniforms and backpacks into a separate wardrobe closet. This is mostly to reduce the content size of the HoS locker, making it easier to use.
-Moved sec backpacks into the security wardrobe closets.
-Moved Captain's formals down in the stack order so it doesn't get in the way of the items that are used more often. Alt uniforms should be stored on the bottom of the pile.
-Removed stealth change giving the Captain the super-robust dermal armor
2014-03-17 23:55:08 -06:00
Jordie0608
a5a9c2fd68 Changed mousetrapbox desc to span 2014-03-18 15:08:49 +11:00
Cheridan
1c0d32e6f8 Merge pull request #3069 from Aranclanos/TableRuntimeFix
Tabling will not runtime if the target runs away from the grab anymore
2014-03-17 22:32:17 -05:00
TZK13
e689130c03 Makes Greenbay into Bluebay, take two. 2014-03-17 22:25:57 -05:00
Cheridan
f0ea037a64 Merge pull request #3071 from Aranclanos/VaultSpawners
Vaultspawners will now use ChangeTurf()
2014-03-17 22:13:43 -05: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
Aranclanos
fcb3bc66c7 Vaultspawners (those things never used that an admin might once in a blue moon) will now use the ChangeTurf() proc and won't make Linda cry 2014-03-13 22:23:24 -03:00
Aranclanos
5f42c17ee9 Tabling will not runtime if the target runs away from the grab anymore 2014-03-13 20:07:02 -03:00