Commit Graph

880 Commits

Author SHA1 Message Date
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
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
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
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
Cheridan
f8facf7f43 Merge pull request #3021 from Giacom/viro_genetics
Added two new symptoms to virology.
2014-03-10 13:31:04 -05:00
Giacomand
1f44d20451 Fixed a typo which was preventing powers from manifesting properly. 2014-03-09 19:18:23 +00:00
MrPerson
6b29fecda1 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/rechargestation.dm
	code/game/machinery/turrets.dm
	code/game/objects/structures/crates_lockers/closets.dm
	code/modules/research/circuitprinter.dm
2014-03-08 22:03:03 -08:00
Incoming
5c3f7777b9 Magic Mania 1.5: Big Trouble in Little Boxstation
---

A Few New Wizard Items

Staff of Chaos: Shoots random magic bolts. Charges faster and can hold more shots than other staves.
Staff of Door Creation: Works the same as the wand of door creation. There is apparently demand for this! Charges faster and can hold more shots than other staves.
Wand Assortment: A belt that comes of one of each useful wand, generated with the highest number of shots possible.

---

Cleaning Up the Spellbook

The spellbook was getting REALLY long, so it's been segmented into pages for spells, items, and one time use spells (aka the fun page). The spellbook also highlights the fact that you can upgrade spells better now.

---

Summon Magic Rebalancing

There's now a new catagory of magic items that are especially potent. These have a very low chance of showing up now and only one can spawn during a casting of summon magic, if one even spawns at all. The person who gets it is not guarenteed to be a surivor either.

In this category: Staff of Animation, Staff of Change, Staff of Chaos, Wand Assortment, Contract of Apprenticeship.

Additionally the staff of door creation is now in the normal pool and the staff of change is no longer in the normal pool.

---

Misc Stuff

Adds Bats and Goats to the staff of change.
Changes the charge spell so if you charge something that can charge on its own there's no chance of degradation.
2014-03-08 17:30:40 -05:00
Giacomand
a92482ee4a Added two new symptoms to virology. They will mutate the victim and randomly set a power/disability block, after cleaning it to remove remaining powers/disabilities. One symptom only sets powers and the other only sets disabilities.
Changed the virus mix reaction to only require one plasma or mutagen, to remove the annoyance that virology has with the randomness aspect of it.

Refactor'd dna code to be a little tidier.
2014-03-07 17:49:01 +00:00
Aranclanos
4c06c21b78 Fixes a runtime regarding the retrovirus deleting itself when there's no affected mob 2014-03-07 10:54:55 -03:00
Ergovisavi
062f368ce0 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss 2014-03-07 04:24:51 -08:00
Ergovisavi
a3ce04c000 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss
Item attack changes
2014-03-06 03:17:02 -08:00
Razharas
c548df264b Conflict fix 2014-03-05 06:30:29 +04:00
MrSnapwalk
00fd755b8c Automerge Fix 2: Electric Boogaloo
This is why we can't have nice things.
2014-03-03 20:12:30 -06:00
Cheridan
d4c81ce247 Merge pull request #2936 from MrPerson/jitterbug_dizzydummies
Redo of jitteriness and dizziness.
2014-03-03 11:35:27 -06:00
MrPerson
3c58091437 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel
Hopefully nothing went wrong but you never know.

Conflicts:
	code/FEA/FEA_fire.dm
	code/controllers/supply_shuttle.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/drying_rack.dm
	code/modules/hydroponics/hydroponics.dm
	code/modules/projectiles/projectile/magic.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_dispenser.dm
2014-03-02 21:39:27 -08:00
Razharas
f3ccaa5936 Merge conflicts fix 2014-03-03 05:42:31 +04:00
MrSnapwalk
789134d8f2 Automerge fix
Fixing the conflicts preventing an automerge.
2014-03-02 17:03:35 -06:00