Commit Graph

1036 Commits

Author SHA1 Message Date
oranges
90340ca794 Merge pull request #19306 from MrStonedOne/511compilefix
fixes compiling under 511
2016-07-14 09:25:52 +12:00
MrStonedOne
80044c3380 fixes compiling under 511 2016-07-13 14:09:37 -07:00
AnturK
1eba595115 Fixes create antagonist for revenants. (#19296) 2016-07-13 13:16:13 -04:00
AnturK
523a2b29fe Implant chair refactor (#19272)
Removes some copypasta
Refactors implant chairs. Adds some fun variations.
2016-07-13 12:59:06 +12:00
Shadowlight213
b4b21842db Sending adminpms from IRC. (#19097)
* Sending adminpms from IRC.

* added limit of 2 messages sent to irc per irc message recieved.
2016-07-13 11:40:18 +12:00
Joan Lung
88324510ed Merge pull request #19149 from coiax/turn-both-keys
Nuclear bombs use TGUI and world.time
2016-07-09 08:39:03 -04:00
Jack Edge
78100f83ea Merge branch 'master' into turn-both-keys
Conflicts:
	tgui/assets/tgui.js
2016-07-08 19:49:12 +01:00
Jack Edge
6a1e144d7e Spacing and removing double brackets 2016-07-08 09:22:33 +01:00
Jack Edge
4fbc1475fe Added (SETCODE) button for nuclear code request
🆑
add: When a player uses a communication console to ask for the codes to
the self destruct, for better or for worse, the admins can set them with
a single click. Whether the admins a) click the button b) actually give
the random person the codes, is another thing entirely.
/🆑

- Also tidied up prayer code to use some new admin defines
- Adds the random_nukecode() proc, which returns a random numeric string
between "00000" and "99999". No more requiring it to be at least 10000,
we have the power of ZERO PADDING.
2016-07-08 09:10:33 +01:00
Leo
4db3109229 Better message for bluespace artillery (#19158) 2016-07-07 08:06:16 -04:00
coiax
3796656340 Adds ammo drops to CTF, fixes reload bug (#19125)
* My bed broke

* Slow healing, nodrop items

* Mark arena as dirty when stopping ctf

* Fixes spooky zombie projectile bug
2016-07-06 07:53:30 -04:00
Jack Edge
3ebb4a4cf6 Fully functional nuclear system 2016-07-05 21:38:08 +01:00
Jack Edge
f8a603a5ed Merge branch 'master' into dynamic-transit 2016-07-02 23:26:14 +01:00
Joan Lung
c801f9a9c9 Replaces umbras with revenants (#19059)
Umbras have been removed.
Revenants have been readded, though they are now vulnerable to salt piles.
2016-07-03 01:33:52 +12:00
Jack Edge
39ae894c2a Verb for clearing transit 2016-07-02 01:23:49 +01:00
Xhuis
8a852f196b Removes shadowling (#18951) 2016-06-27 20:53:35 -04:00
Jack Edge
94966c9997 Merge branch 'master' into tips 2016-06-24 07:47:41 +01:00
Jack Edge
af5110c43e Tip of the round 2016-06-23 00:48:09 +01:00
Jack Edge
dc7c591748 Code review 2016-06-23 00:40:28 +01:00
Jack Edge
233fee6667 Fun->Show Tip verb added
🆑 coiax
rscadd: Our administrators, here at /tg/, don't get enough credit for
their wealth of experience and knowledge. Now they get the chance to
share that with you by giving out custom tips!
/🆑

- Show Tip verb, asks for input, then outputs it to all players in
exactly the format that tips are displayed in. Also supresses the
automatic tip if given before it's sent out.
2016-06-21 20:01:50 +01:00
Jack Edge
5da579b7c4 Merge branch 'master' into random-space
Conflicts:
	_maps/asteroidstation.dm
2016-06-20 13:06:08 +01:00
Xhuis
c81d5fc354 Clockwork cult antagonist creation and job bans (#18730)
* Clock cult creation and jobbans

* Admin creation objective description failsafe

* Failsafe, for real this time
2016-06-20 08:27:57 +02:00
KorPhaeron
8c96d9a37b Yelling at other servers 2016-06-18 13:52:07 -05:00
Xhuis
527dddd95d Complete Revenant Rewrite (#18522)
I'm unhappy with the way revenants are right now, and my code for them is pretty unsatisfactory in comparison to what I know now. Although revenants will still fill the same role of just being spookier ghosts, they'll be a bit more passive - incapable, for instance, of giving diseases to people. The new revenants will be called umbras and will use vitae instead of essence.

Total change list:

    Revenants have been renamed to umbras. Essence has been renamed to vitae. This may be temporary.
    Umbra spawn events are now weighted higher and spawn an unoccupied umbra. Ghosts are alerted to the umbra's position and may interact with it to take control of it.
    Umbras' health is not based on vitae but has a hard cap at 100.
    Umbras have a passive vitae drain each tick, defaulting at 0.01. If the umbra runs out of vitae, they will die irrevocably. They also slowly regenerate health by doing this.
    When an umbra dies, they leave behind umbral ashes that reform after one minute. They're difficult to see and can be scattered by activating them, although they also have high research levels if you're fast enough.
    Harvesting vitae from critical targets no longer kills them. Harvesting a target in general prohibits them from being harvested until five minutes later, but they can be drained again after that.
    EMPs revitalize umbras and give them hefty amounts of vitae due to their physical nature.
    Umbras have four abilities: Toggle Nightvision, Discordant Whisper, Possess, and Thoughtsteal.
        Toggle Nightvision is self-explanatory.
        Discordant Whisper is identical to the original revenant's transmit.
        Possess allows the umbra to slip into a human's body unnoticed. While in their body, umbras will slowly drain vitae from the human at a tiny rate - not enough to cause harm, but enough to induce adverse effects in the clueless human. These effects intensify over time and eventually lead to the umbra being forced out of their host.
        Thoughtsteal paralyzes a living human for several seconds while the umbra steals their memories. After several seconds, the umbra copies the notes of the target's memories and turns invisible - the hapless victim is stunned for several seconds afterwards and can't be Thoughtstolen by the same umbra again. Umbras have an objective to steal the memories of 25% of the station's population.
    Salt piles have been added, created by salt shaker or just by splashing salt. These piles will prevent an umbra from passing and reveal them briefly if they try.
2016-06-17 10:58:07 +12:00
coiax
598daee493 Polymorph retains name and equipment (where possible) (#18587)
Fixes bug where wabbajack statue's eyes didn't close

Removes indentation and tidies the wabbajack() proc

Corrected an inaccurate comment in mob.dm

Mass Polymorph no longer uses a spawn()

Adds syndicate medical borg, cak to possible forms

Polymorphed drones now have random appearances

GODMODE mobs are now immune to polymorph

Wabbajack altars now ghost their sleepers after 10 seconds, 
because they tend to just be abandoned and left there. It's 
all a dream to them, if and when they get pulled from the altar.
2016-06-17 09:36:47 +12:00
Jack Edge
8e806f6bd4 Merge remote-tracking branch 'origin/master' into random-space 2016-06-14 22:17:51 +01:00
Jack Edge
d4118f8798 Cleaned maps, ruin verbs
Also converts some into tgm
2016-06-12 01:32:59 +01:00
Remie Richards
fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
Jack Edge
b082011d22 Adds mass zombie cure, for the boring people 2016-06-05 13:05:21 +01:00
Jack Edge
a35a0d3306 Adds two Fun verbs for admins
- Mass Zombie Infection - gives all humans a zombie infection organ to
all humans, which will make them reanimate on death.

- Polymorph All - This applies a bolt of change to all living mobs.
Slightly laggy.
2016-06-05 12:54:35 +01:00
Leo
71136fc76b Fix add custom AI laws (#18138) 2016-06-02 14:04:06 -05:00
oranges
6f866590b1 Merge pull request #18081 from KorPhaeron/create_antag
Create Antagonist Fix
2016-06-01 19:44:03 +12:00
KorPhaeron
50f8b6d463 Create Antagonist Fix 2016-05-30 21:12:09 -05:00
Jack Edge
3910a546e6 Adds admin logging to megafauna movement
🆑 coiax
rscadd: Admins are now notified if a megafauna uses a wormhole or a
shuttle.
rscadd: A new Shuttle Manipulator verb has been added for quick access
to probably the best and most bugfree feature on /tg/.
/🆑

Megafauna adminnotifies on portal TP

Standard shuttle names and logging

Also ignore .mdme files

Muh commit

Actually works and stuff
2016-05-28 16:26:28 +01:00
Jack Edge
78384666b1 Removes SHUTTLE_* defines being numeric
Wew, there was a lot to change. Fixes #17950. There is a lot of gamemode
code here, so I'm not entirely sure if this is ultimately worth it.
2016-05-26 18:16:45 +01:00
coiax
4483d5275c Shuttle manipulator (#17436)
* Starting out on our tgui journey

* God tgui, why do you need to be updated

You're dynamically generated anyway

* Commit of stuff

* Further progress is being made

* Everyone loves buildscripts

* Further modifications to my incredible running script

* Starting to modify the minimap code to be better

* It's going well thusfar, I guess

* What have I done

* RIP minimap

* FUN FUN FUN FUN FUN

* Adds shuttle_manipulator.dmi

MUH HOLOGRAMS

* Is it done? IS IT OVER

* Peer review

* Some bug fixes

* Makes that damn greentext shut up

* Shuttle registration

* Made the Emergency Escape Bar more robust

No climbing on the bar.

* Do not stare into the operation end of the device

* Compile shame

* THE MOST DUMB

* Passive barmaiden

* Emergency shuttle memes

* MORE SAFETY CODE

* Fancy shuttle manipulator icons

* Smoothing it out

* We are going to have a lot of fun with this one

* Independent blobbernauts

* WABBAJACK WABBAJACK

* Message for attempting to authenticate old style

* Angry alert noise is back

* Revert "Independent blobbernauts"

This reverts commit 34d6af7c9c88cfc2864990cb37b586bb90163dd3.

* No parrot sleep plz

* Moves the special shuttle stuff to special.dm

* No Bartender like a Centcom Bartender

* Non-controversial map changes

- Backup shuttle moved closer to Centcom main structure, docking tube
created
- Moved shuttle import landmark to above Centcom main building
- Added shuttle displays to Conference Room
- Squashed the Chapel a bit in Metastation
- Made the docking port on Z2 massive
- Made the docking port on Metastation a lot larger

* Hacks and slashes at Box

A bunch of things are extended and squashed so Box shuttle dock can
support the MetaStation emergency shuttle.

* Some Metastationshit

* Never ending changes

* Wabbajack to TGM

* Modified the bar, I think that's all of them

* Stops Barmaiden wandering around

* More code review

* Whitspace, the bane of us all

* DIE WHITESPACE DIE
2016-05-26 15:15:19 +02:00
bgobandit
eaf93e34cd Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb
Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2016-05-15 17:19:14 -04:00
AnturK
b9304901c6 Merge pull request #17435 from Shadowlight213/volumefix2
Removes volume control for admin midis
2016-05-13 19:31:04 +02:00
bgobandit
8d1a1fe432 Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2016-05-10 01:14:44 -04:00
bgobandit
134b809fd1 scrubbers, human life.dm, map edits, etc 2016-05-09 18:04:20 -04:00
coiax
937e0232bd Ghost role event code cleanup (#17206)
* [WIP] Ninja refactor and quality of life changes

- [ ] Fix ninja mask being hidden by hood
- [ ] Action buttons
- [ ] Ninjas can be spawned with custom objectives easily

* Adding the /datum/event/ghost_role subevent type

* I hate events retrying with insufficient pop

* OH GOD WHY

* Let's just get rid of retries, it's silly

* Morph now uses the ghost_role event

* Operative does as well

Possibility of being bugged due to inability to run age checks on the
testing server, please be cautious.

* Ninjas, spawning, that sort of thing

Wizard diplomats now use the new ghost question system.

* Code review

* Don't ask ghosts if we have enough selected

* Removes map notation from alien spawn

* Removed comment
2016-05-09 17:10:11 +02:00
Jordie0608
bae1aa915d meant to comment this before shuttles pr was merged and cbb to make a pr, mulebeep1.ogg is unused and not sure why it was added 2016-05-08 22:34:50 +10:00
coiax
5b5d956943 Alternate escape shuttles and ferries (#16761)
* Added a simple bar-theme escape shuttle

Features include a very tough Bardrone, with laws to be a good
bartender, bathroom, a quality lounge for the heads, and a small
gambling table.

* Changed drone's health to 3000

Bardrone is now strong, to cope from stray gunfire.

* Replaces banned variables with alternates

Step_[xy] is bad, mkay?

* Added STV5, the cramped transport shuttle

Well, looks like Centcom only had this ship ready for evacuation. I hope
you're friendly with your coworkers!

* Removed shuttle area from empty space on STV5

* Added cult shuttle

Looks like this automated shuttle may have wandered into the darkness
between the stars on route to the station. Let's not think too hard
about where all the bodies came from.

* Include the Narnar Shuttle

* Meat ferry added

Very basic, could probably use some love from a map wizard.

* Moved shuttle files to shuttles/ directory

* MAPS MOVED AND RENAMED

* Hyperfractal Gigashuttle

"I dunno, this seems kinda needlessly complicated."
"This shuttle has very a very high safety record, according to Centcom
Officer Cadet Yins."
"Are you sure?"
"Yes, it has a safety record of N-A-N, which is apparently larger than
100%."

* I REGRET ADDING THESE

* Into templates you go

* Changed floors

* Hugbox supermatter, for map making

* Shuttles KINDA delete themselves

* Hats in hats in hats in hats in hats

* Use the hugbox supermatter in the shuttle

* Include the new verbs

* Include our new verbs

* Fixed runtime when deleting emergency shuttle

* Added to verb list

* Fixes more runtimes with deleting the shuttle

* Shuttle Destroy verb now functions

* Moved them out of the shuttles/ folder

* We'll need these docks later

* shuttle_import landmark datum made

* Changes z2 to TGM format and adds shuttle_import landmark

* SHUTTLE IMPORT VERB

Is this it? Are we there?

* Some compile fixes

* Emergency bar map updated

* Updated cramped shuttle

* Updated narnar shuttle

* Supermatter shuttle updated

* Meat ferry updated

* Debugging information included

* Debug code, QDEL hints

* Minor updates to collection of maps

* May as well use the snowflake drone code

PICK YOUR OWN BARKEEPING HAT.

* The Lighthouse

*static*... part of a much larger vessel, possibly military in origin.
The weapon markings aren't anything we've seen ... *static* ... by
almost never the same person twice, possible use of unknown storage ...
*static* ... seeing ERT officers onboard, but no missions are on file
for ... *static* ... *static* ... *annoying jingle* ... only at The
LIGHTHOUSE! Fulfilling needs you didn't even know you had. We've got
EVERYTHING, and something else!

* Made supermatter hallucination too powerful

* Added force argument for docking testing

* Added emergency backup shuttle

Hopefully it will never be seen or used. But means that provided it's
there and untouched, even with the accidental deletion of a shuttle,
round will still be able to end as normal.

* Added templates for existing shuttles

* Backup shuttle used if emergency shuttle deleted

* Added backup shuttle transit space

Don't know why transit spaces aren't dynamically generated, to be
honest.

* Hyperfractal Gigashuttle improved

More radiation lockers, chairs which makes it "safer".

* Added Shuttle Under Construction

The documentation hasn't been finished yet for this shuttle. Break glass
in case of emergency.

* Added warnings for shuttle interaction

ARE YOU SURE YOU WANT TO DELETE THE EMERGENCY SHUTTLE?

I mean, I really don't know what will happen, and it's probably
nothing good.

* Snappop(tm)!

Hey kids and grownups! Are you bored of DULL and TEDIOUS shuttle
journeys after you're evacuating for probably BORING reasons. Well then
order the Snappop today! We've got fun activities for everyone, an all
access cockpit, and no boring security brig! Boo! Play dress up with
your friends! Collect all the bedsheets before your neighbour does so!
Check if the AI is watching you with our patent pending "Peeping Tom AI
Multitool Detector" or PEEEEEETUR for short. Have a fun ride!

* Fixed horrific experiment icon, added gambling spawner

* Candle changes

Infinite candles start fires but don't run out.
Infinite candles don't make messages when created.

* Shuttle can dock if already docked

* Fixing bugs with shuttle import

Also, some minor bugs with hugbox supermatter still consuming
gas moles and slowly depressurising the area.

* Admin notice, unload bad template

* Fixes problems with some shuttles

* Warning message if roundstart dock failed

* Compiles.

* Inform admins of shuttle problems

* Names for shuttles, minor tweaks

* Moved shuttle templates to shuttles/

* Version numbers are lame

* Shuttle datums

* Shuttle manipulator barebones

It doesn't do anything at the moment.

* Added shuttle manipulator to Z2

It still doesn't do anything yet, but it looks pretty.

* Use GetAllContents(), don't delete ghosts

* Fixes bug where nothing would actually load

* Cancel button on Destroy Shuttle

* Fixed birdboat shuttle overwriting bar shuttle
2016-05-07 23:35:57 +02:00
phil235
95959a76ef Merge branch 'master' of https://github.com/tgstation/-tg-station into AdminRequests1
Conflicts:
	code/modules/admin/verbs/randomverbs.dm
2016-05-07 12:33:06 +02:00
KorPhaeron
1029e3ce4a Merge pull request #17397 from Shapsy/reload_admins_reloaded
Reloading admins informs un-deadmin'd admins
2016-05-06 20:26:28 -05:00
Shadowlight213
9c5733d374 Removes volume control for admin midis 2016-05-06 15:36:02 -07:00
phil235
524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment
Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm
2016-05-05 21:57:10 +02:00
phil235
76a7fca8fe Some adjustments, following suggestions in the PR discussion. 2016-05-05 21:50:30 +02:00
phil235
68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
Shaps
bd4823e7e3 Now the message for reloading admins comes after the reload 2016-05-04 19:46:02 -04:00