Commit Graph

126 Commits

Author SHA1 Message Date
oranges
6ddd748fb2 Merge pull request #18726 from coiax/spawn-removal-1
Removes spawn() from things I
2016-06-21 09:56:38 +12:00
Kyle Spier-Swenson
0d6bbbb412 stop the pills (#18703)
* RedPills Processing

Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING)

* Fixes a minor bug.
2016-06-20 12:07:44 +02:00
oranges
9d2d092847 Merge pull request #18658 from coiax/fix-18389
Bar tables now shuttle rotate properly
2016-06-20 08:18:48 +12:00
Jack Edge
81a4e188bc Code review 2016-06-19 10:15:26 +01:00
Jack Edge
e33692b1c1 Removes spawn() from things I
- Removes from Sin of Greed slot machine (also cleans up the visible
message to make a difference between viewer and user)
- Removes from ferry request cooldown
- Removes from knock opening doors and closets
2016-06-19 01:06:51 +01:00
Jack Edge
8d4a0b2907 Bar tables now shuttle rotate properly
Fixes #18389.
2016-06-17 09:37:12 +01:00
unknown
a0c866967f Splits languages into languages_spoken and languages_understood. 2016-06-16 18:50:32 -04:00
Cruix
ac0bad5d61 Added priority overlay system. (#18225)
Added priority overlays to atoms, which will not be removed when overlays are cut and will always remain on top when new overlays are added. This requires everyone to use add_overlay() and cut_overlays() instead of overlays += and overlays.Cut(). These procs are found in __HELPERS/icons.dm, and the priority overlay list is found in game/atoms.dm. Everything else is replacing deprecated overlay manipulation.
2016-06-17 10:11:53 +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
Kyle Spier-Swenson
2be36ce8cc fixes shuttle rotation 2016-06-12 18:26:34 -07:00
Remie Richards
b3b60b187b Manual repair of some edge cases. 2016-06-11 23:11:54 +01:00
Remie Richards
fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
Jack Edge
1b7ef78c17 Fixes some minor bugs with the wabbajack
Will always update the icon, rather than sometimes, and replaces weird
&= operator with -= like it should be.
2016-06-07 23:00:42 +01:00
oranges
76ab2582bf Merge pull request #18321 from Cruix/nukeops_war_fix
[s] Fixes nuke ops being able to fly to the station and then declare war
2016-06-07 13:32:49 +12:00
unknown
54e03cb325 Fixes nuke ops being able to fly to the station and then declare war, and fixes screwdrivering the syndicate shuttle computer breaking it forever. 2016-06-06 18:50:39 -04:00
Nerd Lord
e816738280 Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR 2016-06-05 09:03:22 -04:00
Razharas
93f8605753 Merge pull request #18224 from ChangelingRain/shuttlecrush
Slightly improves shuttle crushing
2016-06-05 02:46:33 +03:00
Nerd Lord
3793e6187a Addition Ratvar conversion effects and related changes 2016-06-03 23:19:13 -04:00
Nerd Lord
f653f38418 it's literally just to make protector holos marginally fancier under 'hit by shuttle' conditions 2016-06-03 17:35:54 -04:00
Nerd Lord
10520995a2 Slightly improves shuttle crushing 2016-06-03 17:19:09 -04:00
Jack Edge
b92332053f Shuttle manipulator: Added "Fast Travel" button
🆑 coiax
rscadd: The shuttle manipulator now has a Fast Travel button, for those
admins that really want a shuttle to get to where its going FAST.
/🆑

Also fixes a runtime because I missed a case in the shuttlemode2str
proc.
2016-06-01 15:58:18 +01:00
Jack Edge
5c82b8eae0 Mobs only take damage once from a shuttle roadkill
Fixes #18061.

🆑 coiax
bugfix: You can only be damaged once by a shuttle's arrival. It is still
unpleasant to be in the path of one though; try to avoid it.
/🆑
2016-05-31 04:31:08 +01: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
05d23faeaa Rounds no longer end instantly
I think I learned a valuable lesson today about how changing numerical
modes should be tested.
2016-05-26 16:43:24 +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
Jack Edge
c5a0f8621b Adds stat tracking to cargo
- "export_sold_amount", "object.type|numbersold"
- "export_sold_cost", "object.type|totalcreditsgained"
- "cargo_imports", "pack.type|pack.name|pack.cost" (called for each
crate that is bought)
2016-05-17 06:29:42 +01:00
Iamgoofball
9f57bca8f7 Adds two alternate shuttles (#17592)
* I got the results of the test back - I definitely have breast cancer.

* aaaaaa

* need help translating shuttle code, will pay in shitcode

* fixes

* Update emergency_imfedupwiththisworld.dmm

* Removes copyright infringement

* Update shuttles.dm
2016-05-14 19:06:25 -05:00
Core0verload
a66c2f4418 Machine/computer boards and frames refactor (#17300)
* Map Changes

* Machine/console boards and frames refactor

* More board changes
2016-05-08 12:11:18 +02: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
Cheridan
581a755ae5 Merge pull request #17269 from Core0verload/supplytimer
Drops supply shuttle delay to 1 minute
2016-05-02 00:01:46 -05:00
c0
1cba0fbcdc Drops supply shuttle delay to 1 minute 2016-04-30 07:26:29 +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
Cheridan
fbd16c77cd Merge pull request #16934 from Core0verload/cargo
Changes to Stocks Console UI, cargo fixes
2016-04-28 23:22:17 -05:00
phil235
750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
Jack Edge
70e59d729f Increases cargo shuttle time back to two minutes 2016-04-28 20:11:52 +01:00
Jack Edge
e01a74f8b8 Blend in with the others 2016-04-28 12:38:47 +01:00
Jack Edge
6af0e2a0dc Cargo shuttle now arrives in 2 minutes 2016-04-27 17:35:34 +01:00
phil235
b7da04e8c8 You can now use your PDA on the emergency shuttle console. 2016-04-26 21:43:11 +02:00
phil235
b146131a34 Second commits.
This contains the changes to item_attack.dm
Obj/attackby() now follows a similar structure as mob/living/attackby. It calls attack_obj() (like attack() but for obj) which calls attacked_by (just like attack() does)
The use of the NOBLUDGEON flag changes a bit, it is now used to signify the item cannot be used as a melee weapon at all. No attack animation, no attack message. I've given this bitflag to many items that have an afterattack() so as to not both attack and do the special action (among those items: the rcd)

There's also the code changes to attacking machines: attacking any machine now give a proper message and a sound. And with this, I made more machines breakable (using a health var and the very little used BROKEN stat). Most notably, tables can now be attacked when on harm intent and be destroyed.

The newly destroyable machines have a take_damage() proc used by all sorts of attack (weapon, xeno, animal, hulk, mech melee, gun projectile, thrown items).

There's some more stuff in there, see the PR's description and comments.
2016-04-24 20:37:00 +02:00
c0
4d998af43a Changes to Stocks UI, Cargo fixes 2016-04-17 04:40:06 +03:00
c0
04f1aafa78 Exports 2016-04-13 06:01:40 +03:00
Core0verload
04ce5e42cd World "?status" expansion, Topic() rework
* World "?status" expansion

* New helper procs for shuttles

* fix

* a fix
2016-04-06 02:15:25 -06:00
duncathan
e86cf0f280 praise the good lord, for the game finally compiles 2016-03-29 19:04:37 -06:00
duncathan
3f1375ba39 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	_maps/RandomZLevels/Cabin.dmm
	_maps/RandomZLevels/beach2.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/templates/lavaland_surface_automated_trade_outpost.dmm
	_maps/templates/lavaland_surface_biodome_winter.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	code/controllers/subsystem/air.dm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/effects/aliens.dm
	code/game/objects/effects/overlays.dm
	code/game/objects/items/apc_frame.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/girders.dm
	code/game/turfs/simulated.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/mineral_floor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/simulated/river.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/simulated/walls_reinforced.dm
	code/modules/admin/verbs/buildmode.dm
	code/modules/atmospherics/environmental/LINDA_turf_tile.dm
	code/modules/events/spacevine.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/holodeck/turfs.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/interactive.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/bot/floorbot.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/singularity/narsie.dm
	code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
	code/modules/research/server.dm
2016-03-29 14:46:06 -06:00
duncathan
b9950c4358 turf/open and turf/closed 2016-03-29 13:38:56 -06:00
Cheridan
0288f7c592 Merge pull request #16067 from xxalpha/silky_smooth
icon smooth ss
2016-03-15 04:59:48 -05:00
KorPhaeron
24eb9bd457 White ship can land on lavaland 2016-03-14 14:44:55 -05:00
xxalpha
688137c7dc icon smooth ss
adjustments

adjustements

atharrachaidhean
2016-03-12 23:57:45 +00:00
KorPhaeron
2bb3f668c2 Merge 2016-03-12 15:03:57 -06:00
KorPhaeron
05c3b2d07b Test 2016-03-10 22:41:27 -06:00