Commit Graph

6438 Commits

Author SHA1 Message Date
Alek2ander 006a7e2d40 Removed pAI check in attack_hand
Added pAI check in the Security Camera Console instead.
All the others seem fine.
2014-03-27 19:16:16 +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
Aranclanos 0b1ba613b6 Merge pull request #3177 from phil235/earmuffsfix
Fixing being able to hear with earmuffs on.
2014-03-27 06:52:43 -03: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 96a892cacc Removed some debug check
Fixed the Debugger not selecting antags
2014-03-26 19:49:14 +00:00
Malkevin 5257a2d3b5 -Made Ian sacrifice less of a "Hey fuck you die".
-Made it so that each of the three cultists in live sacrifice get a word, to reward team work
-Made hell water not as deadly
2014-03-26 19:26:28 +00: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
MrPerson 1fa3dbde0c Make ei nath not destroy brains
Also small tweaks to make spells GC if you use the spellremove() proc.
2014-03-26 08:38:26 -07:00
phil235 9701dd16ae Only checking for earmuffs once. 2014-03-26 15:10:08 +01:00
Aranclanos eded7cf127 Merge pull request #3181 from MrPerson/qdel_DEL_THE_MOBS
Make most mobs del() instead of trying to GC them.
2014-03-26 03:37:31 -03:00
Nienhaus 2b168b3ddb Genderless 2014-03-25 10:47:56 -05:00
MrPerson 667a773553 Make most mobs del() instead of trying to GC them.
Don't try to Destroy() objects that get del(). It was causing infinite loops and other problems. It's now ok to have something call del(src) as part of Destroy().
2014-03-25 08:44:40 -07:00
Nienhaus 1d01d07ade New Hair
Adds a side pony tail, longer over the eye hair, a braid along with a
front braid, a bun, an ahoge, pig tails, and a over used anime protag
hair style.
DMI of the new hair. http://puu.sh/7IAKi.dmi
2014-03-25 09:19:20 -05: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
phil235 cc50291765 missed a parenthesis 2014-03-25 03:11:05 +01:00
phil235 3695a916ea Fixing being able to hear with earmuffs on.
I hope I didn't make any mistake, this should prevent ear_deaf from flickering between 0 and 1 while wearing earmuffs.
2014-03-25 02:58:47 +01: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
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
Incoming 5035820e9c fixes me being stupid and not setting creator right
Now for the conflicts...
2014-03-23 11:53:38 -04:00
Alek2ander 5a3b654302 More sanity checks
pAI interface is weird, let's make sure we're always in a valid state
2014-03-23 13:49:10 +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
Malkevin dc05ad6210 Added a scaling system.
6 starting cultists below 30 players and 9 above, escape objective is 10 for below 30 players and 15 for above.

HoP is restricted from becoming a cultist.

qdels

reduced supply talisman uses from 5 to 3

fixed typo in corgi sac_act
2014-03-23 03:40:13 +00:00
MrPerson 9bb2712440 No more message spam from pAI's. 2014-03-22 17:49:45 -07:00
Alek2ander 90c79c0f9d Back to qdel()
Sorry
2014-03-23 01:33:57 +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
Malkevin 825f02f3d1 Changed the admin Traitor Panel command to make someone a cultist use the ticker proc - because its previous snowflake nature I wasted an hour wondering why something wasnt working.... bah
Tidied the supplypacks up for consistant names and to avoid The Bureaucracy crate etc.

Created an Innate Communication verb thats given to the cultists when converted and removed when deconverted.
It possibly works with constructs but cant really test because the make constructs procs are all kinds of messed up.
Anyway - they'll tear at their arms, smear blood on the floor, and communicate as normal per the rune. Its pretty rudimentry right now and could be improved in a few ways - see the comments.

Added a link to open the Read Tome window on the Notes page as apparently alert() is limited to a whopping three choices.

Added a built in communication system for the tomes, it works pretty much like the current communicate rune.

Fixed a load of fucked up tabbing in ritual.dm, I don't know who to blame but I'm betting it was sadbutt.
2014-03-22 20:37:16 +00:00
Alek2ander 81b1b189de paipairing
Stuff
2014-03-22 22:33:09 +04:00
VistaPOWA 5c5f0e5163 Merge remote-tracking branch 'upstream/master' into cyborg_module_in_telecomms 2014-03-22 13:54:57 +01: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
Ergovisavi d0ef73125a Various mining changes IE: mineral amounts per tile, mining mob stuff, mob anchoring, etc 2014-03-20 20:10:54 -07:00
Incoming c37f7781d6 NPCs statues now respect whoever zapped them to life without removing their ability to destroy everyone else. 2014-03-20 20:19:54 -04: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
VistaPOWA 5c48361087 now works in binary
011010010110111001110011011101000110000101101100011011000010000001100111011001010110111000110010
2014-03-20 19:06:35 +01: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
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 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 9221473e2c Answered Aran's very good question 2014-03-18 21:42:59 -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
Malkevin 7d2e2de62c New rune: summon artificer shell ("travel", "hell", "tech")
1 cultist
Requires 4 plasteel to convert to a shell

Boring coder stuff: Wrote a proc called mob/proc/sac_act - pretty simple thing that gets called in the sacrifice rune instead of it being a huge unwieldy wall of text full of conditionals
Exciting future of the game stuff: This will allow me to enable all mobs to be sacrificed.
¬TO-DO: Move current sacrifice code into relevent sac_act procs for humans, monkeys, aliums
¬TO-DO: Write sac_acts for the other mob types
-¬DONE: Corgis
--¬TO-DO: Make corgi sacrifice !!FUN!!
2014-03-19 00:13:28 +00:00