5c5f0e5163
Merge remote-tracking branch 'upstream/master' into cyborg_module_in_telecomms
2014-03-22 13:54:57 +01:00
aa7ae999bd
Fixes map and dmi conflicts as well as the obj suits dmi.
2014-03-22 02:33:36 -05:00
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
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
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
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
d0ef73125a
Various mining changes IE: mineral amounts per tile, mining mob stuff, mob anchoring, etc
2014-03-20 20:10:54 -07:00
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
d2021e1bcd
Merge pull request #3107 from Jordie0608/dancefloorisbetterthantheprancefloor
...
Fixes wirecutters and multitools lacking attack sounds
2014-03-20 11:19:14 -05:00
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
61a4ed7a4d
Merge pull request #3114 from Ikarrus/borgname
...
Allows roundstart cyborgs to select their own name
2014-03-20 11:17:39 +00:00
f32f81d5b5
Hitsound for rods
2014-03-20 15:43:39 +11:00
bb101e80d4
Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy
2014-03-19 18:29:10 -07:00
57fe8ea3f4
Various mineral/material standardizations, minor mob changes
2014-03-19 18:28:56 -07:00
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
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
0fbafdb2db
Added a notice for module changes as well.
2014-03-19 09:07:43 -06:00
c891362dd3
Included fixing cyborg camera names not updating when reclassed or renamed by admins
2014-03-18 23:07:48 -06:00
87f85e7073
Added tracking links to the notices
2014-03-18 22:57:14 -06:00
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
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
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
a5a9c2fd68
Changed mousetrapbox desc to span
2014-03-18 15:08:49 +11:00
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
e689130c03
Makes Greenbay into Bluebay, take two.
2014-03-17 22:25:57 -05:00
f0ea037a64
Merge pull request #3071 from Aranclanos/VaultSpawners
...
Vaultspawners will now use ChangeTurf()
2014-03-17 22:13:43 -05:00
33e6f3f3c8
Screw off crowbar_red leave me alone
2014-03-18 11:29:46 +11:00
3268033ba6
Hitsound for multitool
2014-03-18 11:28:47 +11:00
36f6571b56
Hitsound for wirecutters
2014-03-18 11:24:06 +11:00
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
4e5d757726
Merge pull request #3064 from Rockdtben/removeTLEComments
...
Removing TLE comment stamps and other useless comments
2014-03-14 15:40:27 -05:00
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
5f42c17ee9
Tabling will not runtime if the target runs away from the grab anymore
2014-03-13 20:07:02 -03:00
9f98e67545
Merge pull request #3058 from Ikarrus/nohopsec
...
New Uniform for HoP
2014-03-13 11:32:23 -05:00
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
a034e41f25
Removing TLE comment stamps and useless comments
2014-03-13 08:25:28 -05:00
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
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
c3eef7846b
-Added Nienhaus's new HoP uniform and cap. Old sprites are renamed to hop_old
...
-Removed HoP's spawning armor and moved the one in the locker higher up in order
-Glory to Nanotrasen
2014-03-12 22:32:49 -06:00
6147bf6053
Returned armor vest to the HoP's locker
2014-03-12 10:25:29 -06:00
fba4280ec2
Removes HoP's armor and helmet
2014-03-12 08:47:01 -06:00
6eeeb1e5fe
Removed some useless comments from years ago.
2014-03-12 07:59:34 -05:00
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
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
c03052aed8
DNA injectors get DNA scanner's damage_coeff.
2014-03-11 09:23:41 -07:00
83334f07be
Merge pull request #3041 from hornygranny/balancepass
...
Buffs stun baton + classic baton
2014-03-10 20:54:25 -05:00
b6e7155a24
Changed janitor and atmos tanks slightly
2014-03-10 20:27:21 +00:00
02b8288589
Stun baton buffed, classic baton buffed
2014-03-09 16:46:55 -07:00
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
8423e6765c
Merge pull request #3002 from Aranclanos/GrabOnLockers
...
Grabs won't runtime anymore on lockers
2014-03-09 16:10:20 -05:00
VistaPOWA
TZK13
MrPerson
Razharas
Ergovisavi
Malkevin
Cheridan
ikarrus
fleure
Jordie
Giacomand
Aranclanos
Rockdtben
Emil
RandomMarine
Hornygranny