Ghom
93e090d229
Merge pull request #10309 from Seris02/disablerglasses
...
disabler sechuds, let the adminbus commence
2019-12-31 14:43:39 +01:00
Trilbyspaceclone
24d4684afb
Maybe he means this?
2019-12-30 03:56:44 -05:00
Trilbyspaceclone
1cc4464726
Update engine_goggles.dm
2019-12-29 15:01:02 -05:00
Trilbyspaceclone
ee7346f280
got it
2019-12-29 15:00:33 -05:00
Seris02
f6caff8227
hnnnnnng code improvements
2019-12-29 20:10:15 +08:00
Seris02
0b6242e25d
let the adminbus commence
2019-12-28 00:40:55 +08:00
Trilbyspaceclone
a4f12af2e6
Update engine_goggles.dm
2019-12-26 19:28:16 -05:00
Ghommie
fb2b259d92
Ports "Refactors can_see_reagents"
2019-12-19 17:17:18 +01:00
Lin
9ec8458803
Merge pull request #9983 from Ghommie/Ghommie-cit408
...
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-12-10 23:52:31 +00:00
Ghommie
414d4b7a90
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
2019-12-09 00:04:22 +01:00
Ghommie
238655d599
Fixes eyes blindness a little.
2019-12-06 00:10:50 +01:00
Ghommie
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
Ghommie
a5298dac7e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310
2019-11-27 21:44:56 +01:00
Ghommie
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
Ghommie
449f9f03c3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310
2019-11-10 21:20:24 +01:00
Ghommie
20bafdd855
Unmodularize phantom thief glasses, missing durathread headwear sprites and space-nam clothing.
2019-11-03 03:23:59 +01:00
Ghommie
e991328087
progress
2019-10-19 15:02:56 +02:00
Fermi
4b6d996416
Merge branch 'master' into Blind-quirk-without-anger
2019-10-01 08:41:12 +01:00
TrilbySpaceClone
6a36e5a317
huh
2019-09-12 23:26:07 -04:00
Fermi
1e454ff1a7
Merge branch 'pr/25' into Blind-quirk-without-anger
2019-09-08 03:29:22 +01:00
EgoSumStultus
4a800e1431
blind quirk
2019-07-21 23:48:53 -07:00
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