Commit Graph

25 Commits

Author SHA1 Message Date
Dax Dupont
28ba93edb1 Adds VR Snowdin and Syndicate Trainer/VR Update roll up (#37915)
* Adds VR Snowdin and Syndicate Trainer

* Replace var edit

* I did forget to add a few

* Adds one full outfit spawn

* internals too

* closet

* Extends same Z level check to monitor and emping

* restricted uplinks

* camera bug fixes

don't talk about the bees

outfit changes

More items

outfit fix

* Adds vr sleepers to runtime station

* More mapping fixes

* Adds telecomms to taunt your enemies

* More restrictions

* Some fixes

* badabing

* More fixes

* emag related changes

* forgot the ract

* Additions

* griff resistance mode

* minor changes

* Removes old centcom away map

* Pushes you out of VR if you try to ghost

* this is :b:roke

* this shit is not :b:roke

* as requested
2018-05-25 01:31:36 +01:00
MrDoomBringer
cd7c675d5c Adds a sprite for the "quit vr" action button (#37994)
* is that a motherfucking 90s reference

* WHEN YA FUCK UP BADLY ENOUGH ON ADDING A SPRITE TGHAT YA GOTTA MANUALLY CHANGE CHANGELOG.HTML
2018-05-24 12:30:36 +02:00
oranges
4ac8e026d5 Merge pull request #37948 from DaxDupont/vr
VR fix
2018-05-21 22:38:30 +01:00
Dax Dupont
8a9e226838 [READY] VR mind key transfer (#37909)
Clients entering VR now get a clean mind, which stops any mind related shenanigans like traits, spells etc getting into VR
2018-05-20 17:57:41 +02:00
Dax Dupont
d77136d1f6 Murderdome, a VR experience project w/ general VR improvements (#37730)
* henk

* thunder

* Murderdome, The first VR experience!

* grammar

* map merged

* conf

* oops

* VR sleepers can no be contructed

* badabing badaboom

* VR landmarks now support outfits!

* Maps in vr_sleepers

* Fix
2018-05-20 17:32:33 +02:00
Dax Dupont
865b0997c4 Minor VR sleeper related changes (#36974) 2018-04-08 17:34:25 +02:00
AsV9
d338cac150 Merge remote-tracking branch 'tgstation/master'
Not sure if this worked. Used a wonky special snowflake strat to merge.
2018-03-24 08:57:13 +01:00
ACCount
88187f86d5 Moves some machine sprites into /machines/ folder (#33124)
* Moves biogenerator.dmi

* Separates cryogenic2.dmi into 3 sprite files

* Updates a map

* moves suit storage sprite

* Gives cameras their own file
2017-12-04 14:45:35 +01:00
Tad Hardesty
5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
kingofkosmos
a479714b5f Adds missing span-endings (#30494)
* Adds missing </span>'s.

* ".name]" --> "]" and
"to_chat(GLOB.admins," --> "message_admins("
and one [name] --> [src]

* Earlier commit was a mistake, lesson learned

* Hopefully all is ok now.

* Revert "Hopefully all is ok now."

This reverts commit 3c95e41b4c13ce96469861e9a97453adf4b56826.

* Revert "Earlier commit was a mistake, lesson learned"

This reverts commit d611af1e4a76690453a7f9808b6e2c429b679f6c.

* Revert "".name]" --> "]" and"

This reverts commit d538b9efef2d7d8be9122bf5ceaf105055059bc6.

* message_admins fix
2017-09-11 14:09:53 +02:00
kingofkosmos
d4d898f837 Regularizes resisting out of containers (#30412)
* Regularizes resisting out of containers or relaymoving and getting a notification of it.

* Tweaks.

* Transit tube resist while not cuffed added.
2017-09-09 00:57:51 +10:00
Lzimann
58d0f12c5c Removes a great amount of machinery copypasta with circuitboards.
Also changes New -> Initialize in most of them.
renamed: `code/game/machinery/computer/computer.dm` -> `code/game/machinery/computer/_computer.dm`
renamed: `code/game/machinery/machinery.dm` -> `code/game/machinery/_machinery.dm`
Moved all circuitboards to a new folder at `code/game/objects/items/weapons/circuitboards`
2017-08-09 11:10:48 -03:00
ShizCalev
0e9b3967e2 Spellchecks the map definitions (#29485) 2017-07-25 14:16:06 +12:00
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Jack Edge
44991e125a Removal of checks II
- VR sleepers are human only.
2017-05-01 19:01:16 +01:00
Jack Edge
7cb8007556 Changes /obj/machinery to have atom/movable occupants
Currently `occupant` in /obj/machinery is a /mob/living type. I have
changed it to /atom/movable, and made a type cache to determine what to
"look for" when `close_machine()` is called.

This means that machines can have non-mob occupants. I have some design
ideas for this, but that's after the freeze.
2017-05-01 19:00:07 +01:00
Joan Lung
228df13447 Merge branch 'master' of https://github.com/tgstation/tgstation into initialnew
Conflicts:
	code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
	code/modules/station_goals/bsa.dm
	code/modules/vehicles/atv.dm
2017-04-25 07:32:06 -04:00
Joan Lung
dc0e007a23 A bunch of Initialize()s now have return values (#26464) 2017-04-25 10:51:40 +02:00
Joan Lung
db9d86a39e New() goes in the trash, we've gotta Initialize() 2017-04-19 18:22:26 -04:00
Cyberboss
9e1ef0ffe2 Global variable wrappers (#25325)
* Add the system for managed global variables

* Travis ban old globals

* So you CAN inline proccall, that's neat

* Fix that

* master.dm

* Remove the hack procs

* Move InitGlobals to the proper spot

* configuration.dm

* Fix the missing pre-slash

* clockcult.dm

* This is probably for the best

* Doy

* Fix shit

* Rest of the DEFINES tree

* Fix

* Use global. for access

* Update find_references_in_globals

Always hated that proc

Whoever made it must've bee a r e a l idiot...

* __HELPERS tree

* Move global initialization to master.

Fix the declaration

* database.dm

* Dat newline

* I said DECLARATIVE order!

* Here's something you can chew on @Iamgoofball

* game_modes.dm

* Fix this

* genetics.dm

* flavor_misc.dm

* More stuff

* Do it mso's way. Keep the controllers as global

* Make master actually see it

* Fix

* Finish _globalvars/lists

* Finish the rest of the _globalvars tree

* This is weird

* Migrate the controllers

* SLOTH -> GLOB

* Lighting globals

* round_start_time -> ticker

* PAI card list -> pai SS

* record_id_num -> static

* Diseases list -> SSdisease

* More disease globals to the SS

* More disease stuff

* Emote list

* Better and better

* Bluh

* So much stuff

* Ahh

* Wires

* dview

* station_areas

* Teleportlocs

* blood_splatter_icons

* Stuff and such

* More stuff

* RAD IO

* More stuff and such

* Blob shit

* Changeling stuff

* Add "Balance" to changelogs

* Balance for changelog compiler + Auto Tagging

* Update the PR template

* hivemind_bank

* Bip

* sacrificed

* Good shit

* Better define

* More cult shit

* Devil shit

* Gang shit

* > borers

Fix shit

* Rename the define

* Nuke

* Objectives

* Sandbox

* Multiverse sword

* Announce systems

* Stuff and such

* TC con

* Airlock

* doppllllerrrrrr

* holopads

* Shut up byond you inconsistent fuck

* Sneaky fuck

* Burp

* Bip

* Fixnshit

* Port without regard

* askdlfjs;

* asdfjasoidojfi

* Protected globals and more

* SO MANY

* ajsimkvahsaoisd

* akfdsiaopwimfeoiwafaw

* gsdfigjosidjfgiosdg

* AHHHHHHHHHHHHHHHHHHHHHHH!!!!!

* facerolll

* ASDFASDFASDF

* Removes the unused parts of dmm_suite

* WIP

* Fix quote

* asdfjauwfnkjs

* afwlunhskjfda

* asfjlaiwuefhaf

* SO CLOSE

* wwwweeeeeewwwww

* agdgmoewranwg

* HOLY MOTHER OF FUCK AND THATS JUST HALF THE JOB?!?

* Fix syntax errors

* 100 errors

* Another 100

* So many...

* Ugh

* More shit

* kilme

* Stuuuuuufffff

* ajrgmrlshio;djfa;sdkl

* jkbhkhjbmjvjmh

* soi soi soi

* butt

* TODAY WE LEARNED THAT GLOBAL AND STATIC ARE THE EXACT SAME FUCKING THING

* lllllllllllllllllllllllllllllllllllllllllll

* afsdijfiawhnflnjhnwsdfs

* yugykihlugk,kj

* time to go

* STUFFF!!!

* AAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!!!!!!

* ngoaijdjlfkamsdlkf

* Break time

* aufjsdklfalsjfi

* CONTROL KAY AND PRAY

* IT COMPILEELEELELAKLJFKLDAFJLKFDJLADKJHFLJKAJGAHIEJALDFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

* Goteem

* Fix testing mode

* This does not belong in this PR

* Convert it to a controller

* Eh, fuck this option

* Revert controllerization Ill do it some other time

* Fix

* Working controllerization

* FOR THE LOVE OF CHRIST PROTECT THE LOGS

* Protect admins and deadmins

* Use the inbuilt proc
2017-04-06 23:26:13 -06:00
Cyberboss
012eaec1b9 Mob Initialization (#24840)
* Mob Initialization

* new_player Repath

* Fix the dme

* Fix the shit

* Fix a loc

* Fix another loc

* But, in my haste, I forgot the cola!

* Another loc

* ANOTHER LOC

* Further docs

* Where'd that s come from

* Fix shit

* Better
2017-03-13 20:21:12 +01:00
Lzimann
5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Cyberboss
b86e224571 Makes qdeleted and qdestroying macros (#23666)
* Makes qdeleted and qdestroying macros

* Makes QDELETED and QDESTROYING uppercase

* Swap qdel checks istype's for != null's

* Fix it

* How was this missed?
2017-02-06 00:59:27 +13:00
Remie Richards
41d4f19e78 allows vr sleepers to specify an outfit datum for the virtual human, defaulting to a coloured jumpsuit+shoes. 2016-07-17 14:58:05 +01:00
Remie Richards
1bdbf16ea3 VR+tgui additions:
* Adds "VR Sleepers" which allow the user to enter a virtual body in a virtual world (it's basically a glorified teleporter)
* Allows tgui to process fontawesome icons in stacks, fontawesome icons can stack over each other to fake a new icon (eg a ban icon over a camera to mean "ban cameras")
* tgui buttons are now a MINIMUM of 20px high, as opposed to being permanently 20px high, this is so that large fontawesome icons don't look hideous.
2016-07-17 13:03:01 +01:00