Commit Graph

2403 Commits

Author SHA1 Message Date
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
phil235
53c5b7f5d5 Fixes lizard body markings appearing behind the bodypart layer.
Fixes tail sprite when missing a leg and facing south.
Adds an admin option in human VV to remove a body part.
Fixes typos.
Fixes being able to toggle hardsuit and wintercoat helmet despite having no head.
Changes the dismemberment chance from explosion: bomb armor helps against it, and the maximum number of limbs that you can lose in one explosion is capped depending on the explosion severity.
Missing 1 or 2 legs makes you significantly slower. If without legs, missing an arm makes you slower. You can no longer move when missing all four limbs.
Bodyparts have now force 3 and throwforce 3
Tongues are now properly put in decapitated heads.
Shaking a legless person no longer gives weird results.
2016-05-07 01:00:00 +02: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
Cheridan
6f08be42eb Merge pull request #16933 from Iamgoofball/SNAP-INTO-A-SLIM-JIM
MIGHTY MAN BRANDI BRUTAL HERE TO TEACH YOU ABOUT THE REAL INTER-GALACTIC HEAVYWEIGHT CHAMPION, YOURSELF: Adds a new version of Wrestling to the Championship belt.
2016-05-05 00:50:38 -05:00
Iamgoofball
64629c8d0a THIN TIM 2016-05-04 22:36:44 -07:00
Cheridan
75f404b326 Merge pull request #17337 from ChangelingRain/innatecomms
Cult communication is now innate and has an action button
2016-05-03 20:23:52 -05:00
Nerd Lord
0897f3bc20 Cult communication is now innate and has an action button 2016-05-02 09:11:06 -04:00
c0
20c64fbfbf Blood brood 2016-05-01 17:19:29 +03:00
Jordie
c5812d625e Merge pull request #17263 from lzimann/hogstuff
Some Hand of God fixes
2016-05-01 17:45:56 +10:00
Jordie
265938e7d9 Merge pull request #17220 from Incoming5643/badmins_doing_shit
View vars will now tell you if something has been previously var edited
2016-05-01 17:02:02 +10:00
Cheridan
5a766b0a63 Merge pull request #17236 from optimumtact/patch-2
Fix call to add reagent for inacusiate
2016-04-30 05:27:14 -05:00
Cheridan
7644c7f47c Merge pull request #17235 from optimumtact/patch-1
Prevent negative sqrts in dna heal
2016-04-30 04:21:15 -05:00
Jordie
53fd10c54b Merge pull request #17256 from tgstation/revert-17086-planes_on_a_snake
Revert "Move some stuff from different layers to different planes"
2016-04-30 15:34:17 +10:00
Lzimann
381c7e605c Some HoG tweaks
- Automatic nexus placing time changed to 15 minutes(from 2)
- Follow button for divine telepathy for ghosts
- Divine telepathy's color is now God's color.
- Prophet's gear(hat and staff) prioritizes the backpack instead of automatically equipping.
- CTF spawn protection trap is no longer constructable
- Added follow buttons in check antag panel(admins)
- Changed the order of traitor panel for HoG
2016-04-30 00:42:09 -03:00
Cheridan
d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes
No longer deaf while inside pipes
2016-04-29 20:34:03 -05:00
KorPhaeron
0bbcc00c4d Revert "Move some stuff from different layers to different planes" 2016-04-29 16:07:23 -05:00
phil235
08478cb872 Removes the voting cooldown fix and the say_log timestamp and coordinates.
Adds two files I forgot to add in the previous commit, somehow...
2016-04-29 18:51:14 +02:00
phil235
4efb343d77 * Admins can now bypass the vote creation cooldown.
* Messages in a mob's say_log var are now timestamped and include the coordinates of the mob at the time.
* Fix oil slime extract explosion reaction not being logged.
* Fixes lack of log for reagent explosion.
* Mob's attack_log now show when the mob was electrocuted. Doors get an electrification log when electrified (including via an EMP).
* Fixes gibself admin log showing null instead of the key.
2016-04-29 18:21:53 +02:00
oranges
622b130be9 Proper call to add reagent
Fixes runtime
2016-04-29 21:39:53 +12:00
oranges
a52cba944b Prevent negative sqrts in dna heal 2016-04-29 21:17:05 +12:00
Incoming
10b966b97c View vars will now tell you if something's been previously var edited 2016-04-28 19:38:21 -04:00
phil235
750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
MrPerson
b50e0ee42c Merge branch 'master' of https://github.com/tgstation/-tg-station into planes_on_a_snake 2016-04-27 17:03:32 -07:00
LatD
12f9d205e8 Syndicate bomb delay wire changed to one time use (#16790)
* Syndicate bomb delay wire

* Fixes delay wires

* Add bomb delay variables

* Forgot to remove unused var

* Small fix
2016-04-26 23:28:01 +02:00
phil235
6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
Joan Lung
ad9eec737f Merge pull request #17083 from coiax/ian-looks-very-fashionable-today
Refactors dog clothing
2016-04-25 11:46:44 -04:00
duncathan salt
61ddd6797d Merge pull request #16969 from YotaXP/tgm-maploader
[DNM] Updates the map loader to support TGM style map files
2016-04-25 09:28:26 -06:00
Jack Edge
b9bd58de88 Grammar fixes 2016-04-25 16:28:16 +01:00
phil235
fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
phil235
0480790b0a Same things but with structures now. 2016-04-24 20:38:33 +02:00
phil235
0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
AndrewJacksonThe2nd
e38bfc78c7 aaaaa 2016-04-24 11:02:10 -07:00
Jack Edge
a89d951669 Removed whitespace 2016-04-24 15:42:20 +01:00
Jack Edge
1927fc73e6 Dog fashion on the back 2016-04-24 14:40:08 +01:00
Jack Edge
2f26b8eabc Compilation! 2016-04-24 13:54:37 +01:00
Jack Edge
0fd1f3c7e4 Made /datum/dog_fashion 2016-04-24 13:18:43 +01:00
MrPerson
3f70f880ac Move some stuff from different layers to different planes
Moves everything on a 15+ layer to a plane. So now you get screen catcher (-99, was already on a plane), lighting (15), effects that ignore lighting (16), fullscreen UI effects (18), screen objects used to build the UI (19), actual equipment in the UI slots (20), and everything else (0).

Also created a file to contain plane and layer defines for hopeful eventual use.

Hopefully this doesn't change anything now but does enable some nifty new features in the future.
2016-04-24 04:03:41 -07:00
KorPhaeron
fa82df9982 Merge pull request #17035 from LanCartwright/synapviro
Reworks sensory.dm
2016-04-23 15:05:14 -05:00
PKPenguin321
70926d0c7d removes a comment by remie's request
this is the worst commit ive ever made
2016-04-21 16:43:01 -07:00
Akke
dedf15c2c5 Reworks sensory.dm 2016-04-21 19:30:28 +01:00
PKPenguin321
5aadc0494a fixes conflicts 2016-04-18 16:30:16 -07:00
YotaXP
2072670afd Clean up magic numbers. 2016-04-18 18:28:44 -04:00
YotaXP
0d8cc8aee7 Make the loader use ChangeTurf() for turfs. 2016-04-18 17:41:05 -04:00
YotaXP
03d38bf895 Adds a 'measureOnly' mode to the maploader code for templates. 2016-04-18 16:04:35 -04:00
coiax
e7ad4047df Admin-spawn snowflake drone headgear, plus structural changes (#16935)
* Drones spawn with undroppable chameleon helmets

With a random apperance, for SURPRISES.

* Given drones regenerate_icons() proc

This legacy proc is still used by chameleon items, so drones
get one as well.

* Added drone chameleonmasks that can be toggled

Toggle your custom headgear between hat or mask, be the talk of the town.

* RIP default drone camogear

* Moved drone camoheadgear toggle to the item itself

Now we don't need to worry about clogging up the verbs.

* Added drone camo headgear icons

Thanks Nienhaus so much for spriting these.

* Drone camogear now has customised toggle button

As a side effect of this change, I've made a way of overriding the
normal icon behaviour for item related action datums. If you set
an icon state, it'll behave like a regular action datum, and use
that icon.

* Removed unneeded proc call

* Added 'random' icon to actions.dmi

I borrowed the 'slots1' icon from icons/obj/economy.dmi

* Button to randomise drone camogear apperance

That's THREE GUI BUTTONS for the price of one.

* Made "snowflake" drones; start with drone camogear

* Snowflake drone shell dispensers

(Obviously.)
2016-04-18 11:11:10 -04:00
PKPenguin321
866f63d2d4 makes sec gloves way more obvious
1. makes krav maga gloves pathed under black gloves for fire resistance
2. adds sprites for krav maga gloves to hands.dmi and gloves.dmi
3. sets up a var to prevent krav gloves from being cut into fingerless gloves in color.dm
4. makes sec use the new path for krav gloves in security.dm
2016-04-17 21:06:26 -07:00
PKPenguin321
7501ddebf9 krav update
1. actually adds icons that i forgot to commit to actions.dmi
2. makes leg sweep only do weaken(2) in krav_maga.dm, also adds a /sec subtype of krav maga gloves with a more obvious name
3. makes sec start with the /sec gloves in security.dm
4. makes the krav maga implant a toggle instead of giving you krav maga and deleting itself in implant_krav_maga.dm
5. adds my self to admins.txt
2016-04-17 20:15:42 -07:00