Commit Graph

588 Commits

Author SHA1 Message Date
AndrewJacksonThe2nd
620f1dadc0 Refactors the Prison Break event into the Grey Tide event 2016-06-04 15:35:55 -07:00
GunHog
6d238a2ff7 Vines fix (#18134)
Xenos may now eat vines!
2016-06-02 14:07:16 -05: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
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
0ce5f8582c Lone Operative event now works
Fixes #17556.

Also, a bug where the lone op would spawn with the combat mode on the
sapce helmet has been fixed.
2016-05-21 15:18:52 +01:00
Supermichael777
fb6f7b2472 Makes space dust event less invisible. (#17720)
* makes dust LOUD due to complaints about it being silent while deadly

* Makes the dust event less of an invisible fuck you.

* no balence meme + a slightly less loud sound that still says BULLETS?

* by popular request adds a visble mesage to meteor impacts

* Should not includ balence change with bug fix

* Reduces spam, a lot.

* GHOST METEORS
2016-05-18 23:56:43 -05:00
Incoming5643
f5d58c3f72 Unborks the greentext being too greentextful (#17699)
* Unborks the greentext being too greentextful

* W H O O P S
2016-05-16 20:35:33 -05:00
coiax
feb02815ad Fixes #17665, abductor event finds people now (#17686) 2016-05-15 19:40:04 -05:00
Robustin
05659b153a Adds artificers, reduced juggs/wraiths 2016-05-13 11:01:33 -04:00
Robustin
fc79066a32 WEW 2016-05-12 18:57:42 -04:00
Robustin
6dd999756e Makes Nar-Sie portal storm not retarded 2016-05-12 17:17:41 -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
KazeEspada
e278111d04 Makes a really shitty lord of the rings reference
THROW THE GREENTEXT INTO THE FIRE!
2016-05-05 00:40:06 -05:00
bgobandit
e5ed72520e Ports Cards Against Spess from Polaris (MERGEPLS) (#15872)
* Ports Cards Against Spess from Polaris

* moar

* more

* Moves cards to config files, adds a fuckton more

* ADDS THE FUCKING CARDS TO THE FUCKING MAP TAKE 3 HATE SALT

* fixes the maps, shuts travis THE FUCK UP

* fixes typo

* makes requested changes
2016-04-30 13:35:51 +02: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
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
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
duncathan salt
62688574bc processor overload requires 20 players 2016-04-26 01:05:15 -06:00
Jack Edge
8901ee0610 Actually compiles 2016-04-25 09:22:32 +01:00
Jack Edge
508522c320 Minor explosion damage around exploded machine 2016-04-25 07:15:32 +01:00
Jack Edge
e2888a285b player_list -> ai_list 2016-04-24 16:45:35 +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
Jack Edge
543101879c Actually makes the processor blow up 2016-04-24 09:08:17 +01:00
Jack Edge
3dc1511725 Merge "<br>"s into single call to the AI 2016-04-23 20:13:54 +01:00
Jack Edge
573c5f70b8 Revert "Removed processor explosion chance"
This reverts commit 06f34b1634.
2016-04-23 13:21:40 +01:00
Jack Edge
06f34b1634 Removed processor explosion chance 2016-04-22 14:29:00 +01:00
Jack Edge
cf886fc84d New Processor Overload event
An exospheric bubble has occured, making the telecommunications
processors overload and shut down (and very occasionally, also explode).

But hey, at least telecommunications is still functional? You just gotta
shout REALLY LOUDLY to make yourself heard over the static.

🆑 coiax
rscadd: Centcom regret to inform you that new instabilities with nearby
gas giants are causing exospheric bubbles to affect the
telecommunications processors. Please contact your supervisor for
further instructions.
/🆑
2016-04-22 12:22:58 +01:00
Mike Long
05937cecc2 Fixes the other compile errors. 2016-04-10 20:23:52 -04:00
Mike Long
2da9aa3dda Fixes compile error. 2016-04-10 19:48:05 -04:00
Mike Long
d4d2efa546 Adds new ionlaws: This new class of ion laws causes the AI to refer to things by the wrong name. 2016-04-10 19:25:34 -04:00
AnturK
fee254926e Merge pull request #16680 from Core0verload/nomoremagic
Wizard events will no longer fire unless actually summoned by a wizard
2016-04-09 15:57:30 +02:00
c0
8807c26945 Shuttle Loan fix 2016-04-07 03:26:38 +03:00
c0
c35fe4ea66 Wizard events will no longer fire unless actually summoned by a wizard 2016-04-06 12:03:44 +03:00
duncathan
497a4efc70 makes atmos_spawn_air() use the new gas string parser 2016-04-04 01:49:09 -06:00
duncathan
a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm
2016-04-03 18:22:20 -06:00
duncathan
e86cf0f280 praise the good lord, for the game finally compiles 2016-03-29 19:04:37 -06:00
c0
9f4e6c6c42 Adds two new events-related config options 2016-03-30 02:16:04 +03: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
c0
23fb45ba6e Adds minimal players requirements for random event 2016-03-29 08:49:17 +03:00
Cheridan
eeeff80e5f Merge pull request #16366 from Xhuis/the_forbidden_art_of_fixing_issues
Fix bundle
2016-03-26 21:06:00 -05:00
Xhuis
cc62b89baf Fix bundle 2016-03-26 15:15:31 -04:00
Nerd Lord
e0d355ced9 why bother with a new PR rite 2016-03-25 21:15:04 -04:00
Nerd Lord
f6406fa1fb You can now click through space vines to attack mobs/grab items underneath them
Vine/Vine Mob layering adjusted to be under ghosts.
2016-03-23 11:19:29 -04:00
oranges
2311102c7b Refactors the bulk string framework
In favour of a better json based solution
This overhauls:
    -AI ion laws
    -NPC chatter text

The system is extended to support further splitting of a chosen line
where a line is picked and then searched for subkey's in the form of
@pick(\D+) - sub keys are then picked from the appropriate list that
matches the \D+ key and replaced over top of the placeholder

This is used to add braindamage gibbering messages to the system
2016-03-19 22:37:32 +00:00
KorPhaeron
fa77255e97 Merge pull request #16097 from ChangelingRain/poitext
Wizard Greentext is now on the POI list
2016-03-14 17:33:35 -05:00
Nerd Lord
4357019a18 Wizard Greentext is now on the POI list 2016-03-13 15:53:08 -04:00
KorPhaeron
e24b6f3608 Merge pull request #15817 from xxalpha/cocks
Scrubber clog event now has a chance to spawn cockroaches.
2016-03-13 00:25:59 -06:00