Artur
c9dc35fd9a
Updates the debug outfit
2020-02-06 18:42:23 +01:00
Ghommie
5875f2578c
demodularize and removes lot of unused clothing with missing sprites.
2020-01-28 02:32:46 +01:00
Seris02
25d7af31a5
merge fixes
2020-01-19 16:36:04 +08:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Lin
e5e2e4f012
Merge pull request #10329 from Ghommie/Ghommie-cit490
...
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
Lin
c4cb06f8f0
Merge pull request #10112 from Ghommie/Ghommie-cit447
...
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
Ghommie
4d06d231f8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-02 17:49:01 +01:00
Seris02
46da6604a4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stunglasses
2020-01-01 19:28:56 +08:00
Ghom
93e090d229
Merge pull request #10309 from Seris02/disablerglasses
...
disabler sechuds, let the adminbus commence
2019-12-31 14:43:39 +01:00
Ghommie
80e716eeaf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
2019-12-30 18:14:47 +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
1d449fcd12
changes
2019-12-29 19:46:47 +08:00
Ghommie
21cfb2914b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2019-12-27 17:49:59 +01:00
Seris02
0b6242e25d
let the adminbus commence
2019-12-28 00:40:55 +08:00
Seris02
160e8c1ec5
stunglasses
2019-12-27 23:21:40 +08:00
Trilbyspaceclone
a4f12af2e6
Update engine_goggles.dm
2019-12-26 19:28:16 -05:00
Ghommie
e74339ce8b
Jfc that's a lot of work!
2019-12-23 04:24:13 +01:00
Ghommie
fb2b259d92
Ports "Refactors can_see_reagents"
2019-12-19 17:17:18 +01:00
Ghommie
3fcb7808fd
args
2019-12-13 02:30:17 +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