Commit Graph

206 Commits

Author SHA1 Message Date
xxalpha
9c7ece1faf Swapped SortAreas with process_teleport_locs in world/New (#20131) 2016-08-27 10:26:07 -05:00
Incoming5643
1993b8d7ca [s] Adds the top secret room to centcom (#20071)
* Adds the top secret room to centcom, the final destination of players who manage to cosign themselves to nullspace.

Said room is an homage to a room that served a similar purpose in the legend of zelda.

* Follow up issues pull:
for loop optimization
game logging
spelling errors

* more info for admin message
2016-08-26 08:46:52 +12:00
Jalleo
7da348a3b2 [s]Little fix and var in proc removal (#19821)
* Fixes the gulag teleporter and removes two /var in proc decelerations

* Missed a item

* Revert "Fixes the gulag teleporter and removes two /var in proc decelerations"

This reverts commit ca07f531bb.

* Fixes it properly now

* Test

* Resolves to make it go to breath and gas masks paths instead of all mask paths. My mistake in the rush to solve it.
2016-08-21 00:00:35 +12:00
Joan Lung
cbf733dbc4 Does something, likely to be important, to blob (#19831)
🆑 Joan
rscadd: Once the blob alert message is sent in the blob game mode, all mobs get to see how many tiles the blob has until it wins, via the Status tab.
rscdel: Removed/merged a bunch of blob chems, you probably don't care about the specifics.
tweak: The remaining blob chems should, overall, be more powerful.
tweak: Shield blobs soak brute damage less well.
tweak: Flashbangs do higher damage to blobs up close, but their damage falls off faster.
experiment: Shield blobs now cost 15 resources to make instead of 10. Node blobs now cost 50 resources to make instead of 60.
experiment: Expanding/attacking now costs 4 resources instead of 5, and blobs can now ATTACK DIAGONALLY. Diagonal attacks are weaker than normal attacks, especially against cyborgs(which may be entirely immune, depending), and they remain unable to expand diagonally.
rscadd: Shield blobs no longer block atmos while under half health. Shield blobs are still immune to fire, even if they can't block atmos.
tweak: Blobs should block explosions less well.
rscadd: Blob cores and nodes are no longer immune to fire and no longer block atmos.
rscadd: Blobs can only auto-expand one tile at a time per expanding thing, and should be easier to beat back in general.
tweak: Blobbernauts now attack faster.
tweak: Blob Overminds attack mobs slower but can attack non-mobs much faster.
rscadd: Blob Overminds start with some amount of resources; in the gamemode, it's 80 divided by the number of overminds, in the event, it's 20 plus the number of active players, and otherwise, it's 60.
bugfix: You can no longer move blob cores into space, onto the mining shuttle, white ship, gulag shuttle, or solars.
bugfix: Blob rounds might be less laggy, if they were laggy?
tweak: Blobs don't heal as fast, excluding the core.
experiment: Blobs are marginally less destructive to their environment.
/🆑

Objective:
maybe possibly make blob something you can fight instead of wishing the blob didn't exist?
but also make the blob lethal enough that it can still deal with the crew if it knows what it's doing(and still lose if the crew is good instead of snowballing forever)
2016-08-17 15:48:28 +12:00
Shadowlight213
3628d1b9df Merge branch 'master' of https://github.com/tgstation/tgstation into bayputers 2016-08-05 23:15:39 -07:00
Shadowlight213
0c9554cd35 Base systems pretty much done.
Still need to convert the id computer program.
2016-08-05 22:51:53 -07:00
KorPhaeron
7111c4391f Adds disguting tumours to meta and box, lets RD and engineering build in those tumours 2016-07-30 20:14:51 -05:00
Jack Edge
87016bc6cd Code cleaning; countdown for transformer
🆑 coiax
rscadd: Observers now have a visible countdown for borg factories,
silicons can examine the factory to determine how long it has remaining
until it is ready.
/🆑

- Removes a bunch of spawns and trailing returns
2016-06-25 11:40:03 +01:00
oranges
3a7eab6e05 Merge pull request #18729 from coiax/remove-spawn-3
Remove spawn III
2016-06-21 20:11:08 +12:00
pudl
3406c5ec30 removal 2016-06-20 07:35:33 -05:00
pudl
8ab329341e yay 2016-06-20 07:32:58 -05:00
Jack Edge
9185f06d31 Removes spawn from things 2016-06-19 01:25:29 +01:00
pudl
57ca916f71 ConstructionZone 2016-06-15 13:34:52 -05:00
nullbear
98ee507de8 Adds noteleport variable
This is mostly a pre-setup for my greater-bag-of-holding stuff.

You can't use bluespace crystals/jaunters/hand teleporters to access bluespace-proofed areas. at the moment, this only applies to shuttles and centcomm.

Teleport beacons placed in bluespace proofed rooms can't be teleported to, except via teleporter station hub.

A little concerned because now 'hijack' antags cant use teleprods to fling everyone out of the shuttle while in transit. q_q could easily just make the shuttle non-bluespace proof though.

Note for mappers: This means you can create ruins that can't be teleported into using bspace crystals by setting the area "noteleport" to 1. This can be used to force players to travel through the ruin the way they're intended to. Or to prevent them from gaining access to areas they shouldnt normally be able to. (ie. the wishgranter ruin)
2016-06-09 20:33:25 +12:00
Joan Lung
2cfb2d8eed Layers are now defines (#17949)
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
2016-05-27 22:16:21 +02: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
lordpidey
24f47b0223 Devil Antag Round 2. (#15794)
* Re-making the branch and PR of demon.  See #15118 for the old PR

* Adds toy demonologist to arcade machine reward list.

* Implemented two suggestions: Pitchfork now has a demonic subtype, to potentially give botanists a normal pitchfork.

Suiciding with signed contract now uses forcesay instead of say.

* Fixes compile errors.
Re factors contracts to be subtypes rather than datums.  <--- incomplete, still need to summon them appropriately.

* buffed infernal power contract to give passive healing
Nerfed magic power contract to not give robeless MM

* Fixes compile errors

* Corrects orientation of true demon sprite

* Begins work on the sNPC for the true demon/ arch-demon

* Added funeral garment sprites.  These will be used in banishment rituals (hopefully)

* Stashing my work so I can move to another computer.

Re-working the true-demon, it will be a carbon rather than a simple mob.

* Revert "Stashing my work so I can move to another computer."

This reverts commit e8b1e032997b7e17af4ad8630bf21d3620195c4e.

* Git exploded for me, so I have to make a new branch with EVERYTHING.  sorry.

* Fixes compile error

* Ghosts can now click on an arch demon to become a slaughter demon

* Begins to convert demons into a carbon rather than simple mob.

* Demons now resurrect if not banished.

* Beepsky now properly tells security chat about the level 666 threat.

* Contracts now work again.

* old spells now get removed properly.

* adding pitchfork sprites

* Adds hud for the true-demon.  Not functional.

* Fixes another error in the demon hud.  Still broken.

* Demons are no longer immortal, demon huds work properly now.  (it's barebones, but it works.)

* Fixes the "Have mortals sign at least # contracts of TYPE" objective

* Fixed typo in banishlore() and updated wrath/envy sintouch objectives.

* Adds huds for demons/sintouched/soulless, however they are currently unused.

* Updates the demon's hud to work with the recent hud changes.

* Cleaned up infernal jaunt, it works a lot better now and is less buggy.

* Revival contracts now actually take your soul.

* Fixes #16513

* Replaces the infinite slaughter demons with infinite imps.  Sprites for imps are still needed.

* Adds sprite for imps.  It's a redder, smaller slaughter demon.

* Fixes lack of icon for pitchforks

* Gives summon wealth a more appropriate icon.

* Fixes small part I forgot to merge.

* Fixes a few bugs with demonic resurrection.  It's still very buggy.

* Derp, my bad, I didn't mean to admin myself on the main server.

* Fixes edge case of demonic resurrection failing.  Debraining the demon is NOT supposed to be an alternative for the banishment ritual.

* Also did not mean to change this config file.

* Fixes another error in type 1 demonic resurrection.  It works properly now.

* Updates employment contract text.

* Fixes type 2 resurrections.
Demonic contracts are once again permanently on fire.

* Replaces toy demonologist with toy demonomicon.  It still works the same, just different icon/name.

* Adds demonomicon and employment cabinet to box/meta/dream/efficiency.

I could not add it to mini/bird due to conflicts.

* Edits ministation and BirdStation to have demonomicons and employment cabinets.

* Fixes spelling error

* Adds burial garments to maps.

* Update photocopier.dm

Fixes the span when inserting items into photocopier

* Fixes disrupt_spells proc

* Makes a lot of changes as reccomended by Remie.

* Fixes a compile error.

* Updates the lawify/loreify to be lists.  Does not compile.

* Fixes compile errors.

* Arch demons no longer regress upon death.
Speaking a demon's truename gives the demon the opportunity to teleport to you.
Makes demonomicon not care about capitalization.

* Fixes startup error.  Demonic summoning now works.  It's very simple, just say their true name.

* Demons now have a tongue.  True demon bodies are deleted upon regression.

* Demons can now be punched.
Demons can no longer resist a fire out, since it does nothing to them.

* true demons show up in player panel.  Hellfire works again.

* Prepares for commit 16940

* Demons are now known as devils.

Still needs testing.

* Oops, didn't commit everything last commit.

* Finishes converting demons to devils.

* Fixes speech for lizards/flymen when they speak a demon's name.

* Update tips.txt

* Changes variable from static to global as per Remie's suggestion.

I disagree with Remie's assessment, as a list that will never change, even between games, seems like it should be static.

* Removes devil summoning.  Hopefully, I'll be able to eventually find a way to implement it satisfactorily, but for now, I'll leave it out.

* Removes carriage returns

* Combined modified icon files

* Fixes #17184

* Imps no longer show up in the end round report.  This is because there can EASILY be 100+ imps if the crew is well armed.

Non-employment filing cabinets no longer take 30 sec to wrench/unwrench.

* The lawyer can actually buy souls back now.  Oops.

* Fixes true/arch devil spritesheet to have correct sprite names.

* Relocates Box's employment cabinet to Law office.

* De-devil-ing someone now removes the devilinfo.
De-devil-ing now returns an error when used on true and arch devils

* Re-factors whiteness code for jumpsuits.

* Merges icons, reverts failed merge of map

* Merges map with CAS decks

* Fixes copying employment contracts

* Derp, fixes compile error.

* Replaces antaghud with customizable vision range for knowledge boon.

* Prevents a runtime if devil is gibbed while ascending.

* Neatens contract code, and removes excess variable from humans.

* Fixes compile errors

* Organizes weakness code slightly.  Adds ability for a species override on weakness.  (Make flypeople take 2x damage from flyswatters for example)

* Removes sixteen erroneous characters from the codebase.

* Removes trailing return

* Makes typeless for loops, removes a runtime, and removes unhelpful comments.
2016-05-08 18:44:27 +01: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
KorPhaeron
0e52777d19 Fixes blueprints on lavaland 2016-04-04 04:14:36 -05: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
TrustyGun
ca11ae9264 Adds noir ambience to the detectives office 2016-03-23 19:28:56 -04:00
duncathan
12a6205372 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	_maps/RandomRuins/SpaceRuins/asteroid4.dmm
	_maps/RandomRuins/SpaceRuins/spacebar.dmm
	_maps/RandomZLevels/Academy.dmm
	_maps/RandomZLevels/beach.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/spacebattle.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/RandomZLevels/wildwest.dmm
	_maps/map_files/AsteroidStation/AsteroidStation.dmm
	_maps/map_files/BirdStation/BirdStation.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/DreamStation/z5.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/map_files/generic/z5.dmm
	_maps/map_files/generic/z6.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	_maps/templates/lavaland_surface_ufo_crash.dmm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/structures/lattice.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/misc_floor.dm
	code/game/turfs/simulated/floor/plasteel_floor.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/mulebot.dm
	code/modules/mob/mob_movement.dm
2016-03-10 23:07:21 -06:00
duncathan
5bf31463da removes simulated turfs; adds space gas mixture for space 2016-03-10 17:27:01 -06:00
Remie Richards
6ff3292569 Xeno breathing sounds now play in maint, Is it steam in the pipes? OR IMPENDING DOOM!? 2016-03-02 18:39:03 +00:00
AnturK
b56aefae74 Makes burglar alerts activate poddoors.
Adds generic lock/unlock helpers to /door
2016-02-22 19:08:43 +01:00
xxalpha
06dbea0d5f Merge remote-tracking branch 'upstream/master' into blueprintsarea 2016-01-30 01:29:26 +00:00
xxalpha
e3670adb02 area/setup() 2016-01-30 01:28:44 +00:00
Firecage
d2bd6871d5 Merge Conflict Fix 2016-01-20 14:07:14 +02:00
xxalpha
577488e0d8 safepick
more safepick
2016-01-18 05:46:44 +00:00
Firecage
332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
Firecage
754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
tkdrg
c9deb43f4e Merge pull request #14401 from Kole6738/patch-1
Fix missing plural apostrophe
2016-01-06 14:21:25 -03:00
Kole6738
3a1beb1521 Pluralize
Engineer's Quarters
to
Engineers' Quarters
(I find it unlikely that there's only one Engineer, but if I'm wrong, tell me!)
2016-01-04 18:12:50 -08:00
Kole6738
9e7b9f94f5 Fix missing plural apostrophe
Patients Rooms
to
Patients' Rooms
2016-01-04 18:01:55 -08:00
KorPhaeron
af4dae58e1 Area name 2015-12-19 08:14:31 -06:00
KorPhaeron
8de9b99182 Deepstrike 2 2015-12-17 23:22:37 -06:00
Bjorn Neergaard
c36b70afe0 Fix up comments 2015-12-01 10:37:37 -06:00
Bjorn Neergaard
8cc3a856a2 Add map_name to areas
Fixes #12713
2015-12-01 10:03:03 -06:00
ktccd
395cd5a68c Rewrote a bit of blob code to fix... a lot
Stuff fixed: My sad attempt at fixing #13126.
The expand() proc for blobs is hopefully less intensive now (WHY did it
used to spawn a blob only to destroy it? That must've been such a
waste...).
Destroy code no longer needs to adjust for the expand() proc doing weird
things.
The antag panel will now show the correct variable used to determine
blob progress.
Renamed the variables I used so they're not so similar to each other.
blob_legit and blobs_legit was WAY to easy to mix up.
2015-11-28 01:06:27 +01:00
ktccd
8f24c37f46 Fixes issue #13126 (Better this time)
🆑 ktccd
bugfix: Blob pieces on some areas no longer count for blob mode victory
(Such as space or asteroid).
bugfix: Asteroid areas are no longer valid gang territory.
/🆑
2015-11-24 17:48:21 +01:00
ktccd
9a2c60cac6 Fixes issue #13126and also a few other areas blobs shouldn't be win from absorbing (centcom, SPACE etc).
🆑 ktccd
Fixes bug #13126 and also a few other areas blobs shouldn't be win from
absorbing (centcom, SPACE etc).
Added a variable to areas.
Kept the original blobs list as a list of all blobs, in case that was
used somewhere else, and instead made a separate list for legit blobs.
/🆑
2015-11-24 01:09:01 +01:00
Vincent
faf5ddaceb Holodeck refactor and Enchancements
Moves holodeck code to modules/holodeck.  Repaths holodeck structures a little.  Cleans holodeck code and prepares for additional features (multiple holodecks, etc).  Should fix #4828.

Necessary map bugfixen for Asteroid, Disc, Dream, Meta, and TG.
Adds Lounge, Emergency Medical, pet center, and holdout room to the rec holodeck.

All items spawned by the holodeck will do only stamina damage, except when emagged.  This allows emergency medical to be staffed with scalpels and bonesaws and such.  Emergency medical has some functioning equipment but the only drugs available are in the sleeper.
2015-11-15 20:23:23 -05:00
Cheridan
3e3aa2ee9f Merge pull request #12748 from MrStonedOne/sweetsweetdimlight
[Pretty Pictures!] [map] Makes starlight have far spreading low levels of light rather than near spreading high levels of light.
2015-10-31 22:22:39 -05:00
MrStonedOne
8c755da84f Adds a way to make certain area/space areas not force 100% brightness 2015-10-31 02:30:49 -07:00
MrPerson
2f9c5b38f0 Removes the unused lastarea mob var
I think it was used for ambience music a long time ago.
2015-10-28 04:25:18 -07:00
octareenroon91
8fd47124ba Area Name Propriety
The time for improper is over.
#12433
2015-10-18 06:14:00 -06:00
MrPerson
2eea0a85e5 Makes areas invisible unless needed
This should hopefully improve client performance due to having fewer objects to draw. Might also help with that teleporting crash.
2015-09-24 23:27:09 -07:00
Firecage
dfae1e0b53 Changes a lot of del() to qdel() 2015-08-16 23:33:22 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00