Commit Graph

1861 Commits

Author SHA1 Message Date
oranges
0432cd9bb4 Merge pull request #18484 from coiax/random-space
All of space is now randomised
2016-06-23 09:12:48 +12:00
Joan Lung
8c8c69c8ac Merge pull request #18714 from coiax/fridge-magnet
Station rename logging, admin reject button
2016-06-21 08:46:17 -04:00
Jack Edge
3e30473365 Applied MSO's proposed changes 2016-06-21 13:34:36 +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
oranges
b43afb8209 Merge pull request #18721 from KorPhaeron/yellingatotherservers
Allows basil and sybil captains to yell at eachother
2016-06-20 11:41:43 +12:00
unknown
4b396a52e7 Resolved conflicts 2016-06-19 15:07:36 -04:00
KorPhaeron
8c96d9a37b Yelling at other servers 2016-06-18 13:52:07 -05:00
Jack Edge
4b70b35c3e Back by popular demand, custom naming 2016-06-18 17:36:03 +01:00
unknown
b12398e9fc Resolved conflicts. 2016-06-18 12:17:00 -04:00
Cheridan
4e4f394a60 Merge pull request #18674 from tgstation/RemieRichards-わたしのなまえはレミエです
Fixes Anime Names
2016-06-18 11:14:31 -05:00
Remie Richards
2bf7841de3 Fixes stupid mononamers
But only because it would runtime.
2016-06-17 20:33:50 +01:00
Remie Richards
89c9f6d86d Fixes Anime Names
casually forgetting that gender defines are numbers
2016-06-17 15:35:42 +01:00
MrStonedOne
d220416ed3 Makes ipintel only warn, fixes some cache things. 2016-06-17 03:54:42 -07:00
MrStonedOne
c37ae784e7 Adds local cache, doesn't check reconnects, fixes bugs 2016-06-16 21:04:52 -07:00
MrStonedOne
2523a0d604 whitespace and code formatting changes. 2016-06-16 21:04:52 -07:00
MrStonedOne
d67b9cbe0c Removes debugging messages 2016-06-16 21:04:51 -07:00
MrStonedOne
2366eb1a20 PUTS NIKNAK OUT OF A JOB! 2016-06-16 21:04:50 -07:00
unknown
f33a7efbf7 Resolved conflicts. 2016-06-16 19:10:07 -04: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
unknown
a0c866967f Splits languages into languages_spoken and languages_understood. 2016-06-16 18:50:32 -04: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
oranges
4af9392f01 Merge pull request #18333 from KorPhaeron/charter
Captain's Charter/Captain can name the station
2016-06-09 15:39:41 +12:00
KorPhaeron
576c215270 Fixes charter 2016-06-08 21:04:01 -05:00
KorPhaeron
51d7f86e6a Admin Override 2016-06-07 01:57:33 -05: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
coiax
4d091c010e Adds Asteroid emergency shuttle to station (#18125)
Wow, this one is a WEIRD one.
2016-06-02 15:48:08 -05: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
oranges
7d3e3d0b85 Merge pull request #17832 from KorPhaeron/animes
Just like one of my japanese animes
2016-06-01 10:15:59 +12:00
KorPhaeron
50f8b6d463 Create Antagonist Fix 2016-05-30 21:12:09 -05:00
oranges
77f44e9a27 Merge pull request #18016 from lzimann/patch-8
Fix wizard follow button not working in check-antagonists
2016-05-31 08:29:16 +12:00
Leo
9789e6bae5 Fix wizard follow button not working 2016-05-29 00:20:34 -03: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
oranges
bc61c8a13d Merge pull request #17904 from coiax/renaming-the-annoying-ones
Renames files under code/ with naughty characters
2016-05-26 01:39:56 +12:00
Jack Edge
7f49175967 Renames files under code/ with naughty characters
Like seriously, don't use spaces in file names, this is a codebase,
they're annoying. Hopefully Github will show these renames correctly.
2016-05-24 12:16:19 +01:00
Xhuis
9db933124d Conflicts III 2016-05-22 15:05:00 -04:00
Remie Richards
e952644ae2 Improves how a seifuku is picked, abides by japanese honour system. 2016-05-21 21:20:31 +01:00
KorPhaeron
c36f7e3a56 Just like one of my japanese animes 2016-05-21 14:34:41 -05:00
Xhuis
9a3fd869dc Tweaks 2016-05-15 17:51:55 -04: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
Joan Lung
f95e956d88 Merge pull request #17429 from Shadowlight213/ctfnotify
Adds a notification for ghosts for enabling or disabling CTF
2016-05-12 23:59:03 -04: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