Commit Graph

81 Commits

Author SHA1 Message Date
Ghommie
1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-15 17:33:41 +02:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie
ffecca8c11 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-03 03:24:28 +02:00
Ghommie
c01499b5a0 Ports in radials for reagent grinders, alt click to eject beaker and beaker swapping. 2019-06-23 04:32:39 +02:00
Ghommie
d5279c8373 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-06-17 09:51:22 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Ghommie
0513f3464a one 2019-06-05 19:20:25 +02:00
Trilbyspaceclone
b27ab885f3 [Ready] Adds new huds that help correct vision. (#7943)
* Fixing updater

* Adds the things

* Update all_nodes.dm

* Update misc_designs.dm

* Update hud.dm

* Update engine_goggles.dm

* Update _glasses.dm

* Update hud.dm

* Update packs.dm

* Update misc_designs.dm

* Update packs.dm

* Update hud.dm

* Update all_nodes.dm

* Update all_nodes.dm

* Update hud.dm

* Update misc_designs.dm
2019-02-05 18:09:34 -08:00
Poojawa
4ed3ac7b3d Purges Icon_override 2018-09-26 14:27:28 -05:00
kevinz000
f694924573 Update _glasses.dm 2018-09-05 06:47:23 -07:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
LetterJay
ea9b3622fd Merge branch 'master' into upstream-merge-37476
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
deathride58
20ac9089a7 Merge pull request #6678 from Citadel-Station-13/upstream-merge-37710
[MIRROR] Makes eye of god lava & fire proof
2018-05-11 03:45:28 +00:00
kevinz000
44dac80383 Makes it a bit easier to see radiation 2018-05-09 16:20:48 -05:00
FrozenGuy5
a4410b2aec Makes eye of god lava & fire proof (#37710)
* Makes eye of god lava & fire proof

* eye of god is fire and lava proof
2018-05-08 13:21:37 -05:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
KorPhaeron
b36d88900f Makes engine goggle numbers more visible (#37324) 2018-04-22 19:21:13 -05:00
vuonojenmustaturska
ed201bc65d Gives mining bots back their mesons (#37196)
* Gives mining bots back their mesons

* qdel
2018-04-16 04:36:40 -05:00
iksyp
c0e45aa0a8 Night vision goggles no longer cancel out thermal eyes (#36609)
cl
fix: night vision goggles no longer overwrite thermal eyes. nvg eyes no longer overwrite thermal goggles.
/cl

fixes #35921
2018-03-28 12:16:38 -05:00
Poojawa
f3a806923c Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop 2018-03-20 23:00:12 -05:00
CitadelStationBot
7c8c8f3a0a [MIRROR] Engie goggles in Meson mode now respect light levels (#6028)
* Engie goggles in Meson mode now respect light levels (#36504)

* Engie goggles in Meson mode now respect light levels

Meson glasses show the surrounding terrain, but darken areas beyond line of sight and that are not lit. Engineer goggles set to Meson mode currently show all terrain at max brightness. As a result, it can be hard to even know an area is unlit until objects (or mobs) suddenly start popping in one tile away.

This change makes the Engineer goggles respect light levels like Meson glasses do.

An image for visual aid;
https://i.imgur.com/KdYmkZb.png
Left shows the current Engineer goggles. Right shows the current Meson glasses, and how the Engineer goggles will look with this change.

* Update engine_goggles.dm

* Engie goggles in Meson mode now respect light levels
2018-03-19 21:44:30 -05:00
Poojawa
796e22beac LOCAL SUNE PORTS... OH GOD WHAT HAPPENED
That feel when you're in the 'Oh, well while I'm here...' mindset.
2018-03-18 09:02:13 -05:00
CitadelStationBot
8dc9fcf816 [MIRROR] Fixes blindfolds blinding when not over your eyes (#5936)
* Fixes blindfolds blinding when not over your eyes (#36316)

* fixes blindfolds

* lets use ref instead then

* Fixes blindfolds blinding when not over your eyes
2018-03-13 05:45:53 -05:00
CitadelStationBot
7cdeebab69 [MIRROR] Blindfolds properly apply blindness (#5782)
* Blindfolds properly apply blindness (#36101)

* blindfolds properly apply blindness

* covering your eyes now applies blindness

* Blindfolds properly apply blindness
2018-03-04 05:26:37 -06:00
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
MMMiracles
4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
LetterJay
f26f1b5370 Merge pull request #5037 from Citadel-Station-13/upstream-merge-34522
[MIRROR] Adds ~70 more suicides
2018-01-23 10:00:04 -06:00
MrDoomBringer
4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
Cruix
23e5b7f396 Consolidated t-ray scanner code (#34759)
* Consolidated t-ray scanner code

* Fixed cables not showing up on t-ray scans
2018-01-22 15:45:07 -06:00
modularized_suicide
f13426c5af many flashes?? 2018-01-07 02:07:39 -06:00
LetterJay
30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
AnturK
bbca0afa37 Fixes thermals, also drops the see invisible from thermals. (#33950) 2017-12-31 06:30:34 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
LetterJay
8a792d6ef6 more save points 2017-12-29 00:07:36 -06:00
Jordan Brown
164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
deathride58
f57e02ce95 Merge branch 'master' into donoritemmodularization 2017-12-04 20:17:02 -05:00
deathride58
507c862c7c Update hud.dm 2017-11-28 22:24:00 -05:00
Cruix
b23c92b056 Added bot path data huds 2017-11-28 06:28:40 -06:00
deathride58
8d39fb9dce merges https://github.com/tgstation/tgstation/pull/32678 2017-11-22 17:40:25 -05:00
ShizCalev
6ab499b57b Fixes bartender suit having an adjust state 2017-11-22 12:40:32 -06:00
Jordan Brown
d0789ecaf9 Splits clothing.dm in 7 other files 2017-10-21 19:01:30 -05:00
Emmett Gaines
28f3bc0918 Adds radiation goggles and a small rewrite to make adding more view modes in the future easier (#31751)
* adds radiation goggles

* cleanup
2017-10-19 02:54:23 -05:00
Jordan Brown
bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00