Commit Graph

895 Commits

Author SHA1 Message Date
Miauw 5abb553f4a Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
Conflicts:
	code/_onclick/telekinesis.dm
2014-04-08 14:29:58 +02:00
Razharas 862f76c85f Merge pull request #3331 from Giacom/danerfs
Nerf stats to the Genetic Power symptom.
2014-04-07 18:47:27 -07:00
Giacomand 3812210a63 Spelling. 2014-04-05 18:41:52 +01:00
Giacomand c96ea43bfd Nerf stats to Genetic Power Symptom.
Increases the rate of mutating.
2014-04-05 18:34:40 +01:00
Miauw62 39a077761c Merge pull request #3264 from Menshin/Wizarditis_and_inv
Fixed "update inventory X" procs and clothes from wizarditis not showing
2014-04-05 18:43:40 +02:00
Razharas 5626ad9bbc Merge pull request #3275 from Aranclanos/TeleportersFix
Fixes and some minor changes regarding teleports/portals code.
2014-04-03 22:05:45 -07:00
ikarrus f46cb302a4 Updated to work with newer cyborg code. 2014-04-02 22:12:36 -06:00
ikarrus f705141fce Resolved Conflicts:
code/datums/wires/robot.dm
2014-04-02 20:23:31 -06:00
Aranclanos fc915bf800 If you try to use the teleporter and the teleport was rejected for any reason (like having a nuclear disk), you won't get the chance to get a random damage from the teleport.
Fixes issue #2236.
Removed some spawn() calls.
Removed the chance of fail from the portal effects (the blue portals made with hand teleporters).
The portal datums will now return 0 if the teleport failed, and now use a new proc, start(), instead of New() to handle themselves.
Standarized teleport.dm from the helper_datums folder.
Removed the checks for centcomm z level and away missions z level for teleports. Now you can go there.
changed the /red messages from the teleports datum to span classes.
The "[something] bounces off of the portal!" were replaced for "The portal rejects [something]".
Removed an extra "the" on those messages.
2014-04-02 08:36:33 -03:00
Menshin f411ccaad6 * Fixed the update_inv_* functions to actually update the inventory HUD even if the inventory is closed (that should fix items presents in the inventory but invisible).
* Fixed clothes from wizarditis not appearing on character and inventory.
2014-04-01 19:33:38 +02:00
Aranclanos ed692bcaf7 Merge pull request #3258 from MrPerson/wizard_WOOPSIES
Fixed a serious as fuck bug where wizard spells don't recharge
2014-04-01 09:59:39 -03:00
MrPerson f1645bcf64 Fixed a serious as fuck bug where wizard spells don't recharge 2014-04-01 05:56:06 -07:00
Aranclanos 6c1150dca3 Merge pull request #3143 from Malkevin/saccult
Sacrifice Cult
2014-04-01 02:18:39 -03:00
Cheridan 354dbeacde Merge pull request #3219 from phil235/ReqConsoleFix4
Adding hacking messages for fire alarm & requests console
2014-03-31 20:28:37 -05:00
Cheridan 5fce1835b2 Merge pull request #3144 from Ikarrus/borgdebug
Debugging Cyborgs during Construction
2014-03-31 18:48:50 -05:00
Malkevin 0725ba44a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 2014-03-31 22:17:24 +01:00
fleure cccb3dcf76 Merge pull request #3226 from Giacom/syndicate_fab
Syndicate Suit Fashion
2014-03-31 19:35:45 +01: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
Giacomand d07519629c Advance diseases cache the generated id to help stop the amount of calls to sortList. 2014-03-30 12:44:00 +01: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
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
Cheridan c8da962b40 Merge pull request #3195 from MrPerson/qdel_ei_nath_REDO
Make ei nath not destroy brains again
2014-03-28 13:03:11 -05:00
phil235 ca18b5e6d4 Replace wiresexposed var by panel_open 2014-03-28 13:31:53 +01:00
Malkevin cd6c1272ad Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 2014-03-27 13:18:46 +00:00
Razharas f24dd84565 Merge pull request #3187 from phil235/pierrotfix
fixing the cure description for Pierrot's Throat.
2014-03-26 16:56:00 -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
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 3db5e0d137 Changing cure description to "Banana products, especially banana bread." 2014-03-26 15:36:48 +01:00
Aranclanos 3eba3968d2 Merge pull request #3135 from Perakp/mimeFix
small mime fixes
2014-03-26 02:53:26 -03: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
ikarrus 561c0f8dda Resolved Conflicts:
code/_onclick/ai.dm
2014-03-25 09:07:38 -06:00
phil235 9181752ca3 fixing the cure description for Pierrot's Throat.
The possible cure will now read as "Banana" so that people don't think the cure is to eat a single banana.
2014-03-25 15:46:43 +01: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
ikarrus f389ff5117 Resolved Conflicts:
code/game/machinery/doors/door.dm
2014-03-22 16:49:37 -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
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
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
Perakp 88f62dbfa7 small mime fixes
- mime wall doesn’t disrupt sounds no more
- you can do mime walls even while wearing a muzzle
2014-03-22 12:04:04 +02: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
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 e73586dadf Resolved Conflicts:
code/modules/security levels/keycard authentication.dm
2014-03-18 00:17:22 -06:00
Razharas 072b8d2bcb Merge pull request #3067 from Giacom/virus_food_mix
Forgot to change the virus mix reaction, for blood + virus food, to 1 unit.
2014-03-17 09:02:45 -07:00
ikarrus 7b44bed140 Rewrote how emags work on doors
Intended to allow the deconstruction and replacement of the doors without needing an RCD. Emagged doors will be unusable for at least 60 seconds, so weld+emagging still works. It's just not permanent.

Using an emag on a door will:
-Try to open the door
-Cut power for 60 seconds
-Drop bolts
-Cut bolt lights
-Effectively make the door unusable for at least a minute

Doors that have been emagged:
-Can only be opened with a crowbar or axe if the power is off and the bolts are up
-Can be hacked as normal, except the Open wire will not work
-Cannot be interfaced by silicons at all
-No longer prevent players from using tools (Can we unwelded, wires cut, etc)
-Can be deconstructed and repaired

Misc: Also made it so you can bump open doors even if the panel is open. So people can't go around opening all the panels and making the doors really annoying to open.
2014-03-17 00:56:33 -06:00
ikarrus d065af8b8c Emergency Access Override Update
-Changed the way emergency access override is handled. It now toggles a var which overrides access requirements instead of removing/adding access
-Airlocks now have blinking amber lights when in emergency mode
-AIs can toggle emergency override on individual doors
-Humans may disable emergency overrides by pulsing the ID scanner wire. They can't enable it, since IMO there are enough methods to hack open doors without an easymode all-access wire
2014-03-15 14:59:39 -06:00
Perakp fa56f9892e Merge with master, dissonant shriek and organic space suit
- Changed dissonant shriek and organic space suit from old verb system
to new system.
2014-03-15 13:49:26 +02:00
Giacomand b48895d811 The genetic symptoms will now archive your DNA and set your DNA back when it is cured. 2014-03-14 15:45:19 +00:00
Razharas 371f29ed5f Merge pull request #3018 from Aranclanos/RetrovirusRuntime
Retrovirus runtime fix
2014-03-12 22:31:54 -07:00
fleure 8399cdb44d Added watertank crates 2014-03-10 20:46:53 +00:00