evilew
10ef9e374a
Nanotrasen to GATO - comments
...
I know it's a mess, but the least I can do is add comments anywhere I can
2024-11-19 01:59:28 +01:00
evilew
edea3ae8e0
nanotrasen to gato
...
Replaced most instances of Nanotrasen mentions into GATO, though I've kept some that have more sense to be kept as Nanotrasen (like nanotrasen marked stuff and such)
2024-11-09 23:05:02 +01:00
SandPoot
f2a49bc319
first commit with everything
2023-01-08 21:36:57 -03:00
TrojanCoyote
1553b99107
Lets inheritance decide volume
2022-06-13 11:17:21 -05:00
TrojanCoyote
ad74a6033e
HoS plate carrier
...
adds a plate carrier for the HoS
2022-06-08 17:52:32 -05:00
SandPoot
695835fcd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 00:03:13 -03:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
zerothebigboy
5a8a069cd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into intern
...
# Conflicts:
# icons/mob/clothing/suit.dmi
# icons/mob/clothing/suit_digi.dmi
# icons/obj/clothing/suits.dmi
2021-09-09 04:49:30 -04:00
keronshb
ea3b248e6c
Ports Parade outfit changes
2021-09-05 14:17:52 -04:00
zerothebigboy
5206524dd4
gommit
2021-09-02 07:38:48 -04:00
qweq12yt
3afb801036
huh
2021-04-28 15:41:20 -03:00
Detective Google
0fbd27fcfb
reskin_obj is now a radial
2020-08-21 14:57:11 -05:00
Timothy Teakettle
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
timothyteakettle
e8fade4f7f
changes
2020-07-18 02:29:12 +01:00
Timothy Teakettle
a4478b0cda
it continues
2020-07-17 22:38:28 +01:00
Ghommie
0779dd560e
More and more fixes.
2020-06-29 18:52:37 +02:00
Ghom
8cb15f9279
Actually Balanced and Standardized Vendor Prices. ( #12495 )
2020-06-09 22:22:53 -07:00
Ghommie
7fb96ab0cf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-05-12 20:06:59 +02:00
Ghommie
b383066e57
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
2020-05-02 00:00:49 +02:00
Ghommie
87a6bd013c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-04-17 21:57:21 +02:00
Ghommie
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
Ghommie
d2b624a908
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667
2020-04-09 14:59:40 +02:00
Ghommie
56669f9296
Minor snowflakes clothing variations refactor. Removal of copypasted states.
2020-04-04 00:22:18 +02:00
kevinz000
bf0970d8c3
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-23 15:34:04 -07:00
zeroisthebiggay
f5a96241ab
sneaksuits are not fireproof ( #11573 )
...
* and i wanna die
* i decide to revert
* a a a a
2020-03-23 15:47:41 +01:00
kevinz000
300c8e3c6d
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-21 09:53:39 -07:00
ZeroMan
35a4d71a54
im sorry little one
2020-03-19 21:59:14 -04:00
kevinz000
7fdbcc55c6
s
2020-03-16 11:12:10 -07:00
Ghommie
f2c8a7cd6f
Porting a couple material datums code updates and fixes.
2020-03-04 15:59:46 +01:00
Ghommie
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
Ghommie
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
necromanceranne
43c4debb4f
Repaths the formal security items into armor vest subtypes and subtypes of their respective owner's armors. Probably has some really silly balance ramifications. Oh and russian officers have armor vests now I guess. Oh and the sec wardrobe no longer has the formal suits.
2020-01-31 11:54:18 +11:00
Hatterhat
186194418e
tg 43454+43688 port, tweaks w/ trilby, db crate
2020-01-04 01:33:32 -06:00
Ghommie
e987eb27b9
Adjusting a few dozen suits' body coverage.
2019-09-12 23:56:50 +02:00
lolman360
0451390778
control click and then drag is easy
2019-08-11 11:16:19 +10:00
Ghommie
31bd9104bb
Ports "Adds blueshirt items to sectech and defines them better."
2019-07-13 06:42:09 +02:00
Sishen
3fee680f39
rename flag is for pen, my mistake
2019-06-19 16:09:03 -04:00
Sishen
3211a199af
trenchcloak
2019-06-19 15:57:47 -04:00
Poojawa
5f358a5a75
Local sune fixes armor without having to do spritework
2019-05-18 23:42:29 -05:00
deathride58
d8f738184b
Replaces disarm right click action with tgstation/tgstation#42958 's disarm action, also ports the removal of non-help intent pushing from that same pr
2019-03-04 21:05:50 -05:00
Poojawa
42b1d03d2a
[READY] Tauric full body suits ( #7639 )
...
* let's get this back on the table
* split 'em up because sorting memes
* Gets stuff code-ready, sprite work to continue
Engineering / Atmosia / Cheng
Civilian Space
Blood Red / Red and Black
Riot / Armor vests
Radiation / Fire / Atmosia Fire
Bio Suits (Viro/CMO/basic)
ERT / Deathsquad
* It's messy, but it works so w/e
* let there be more tail access
* finishes naga taur spriting
* memes
* super fixes any lingering memes
* leg experiment
* nah, this isn't gunna work.
* poked at canine again
* saving memes
* tweaks some fixes and things
* finished quad suits, added bomb suits for nagas also
* "inconsistant indentation" Byond you fuck
* Take that, byond
* The war on Byond continues
* let's make sure the explorer gear uses fancy sprites
* syndiE ??? wtf did I sleep type
2018-10-18 09:30:37 -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
931a950adb
Merge branch 'master' into upstream-merge-37486
2018-05-21 08:59:32 -05:00
deathride58
b0d896a19b
Update armor.dm
2018-05-10 23:42:56 -04:00
KorPhaeron
cc8fb19166
Anomaly Armour Research
2018-05-09 15:55:03 -05:00
vuonojenmustaturska
3f6167d08e
Moves several clothing-specific flags from /atom to their proper type
2018-04-28 13:21:48 -05:00
CitadelStationBot
3d26cd4a6f
[MIRROR] Replaced body zone magic strings with defines ( #6004 )
...
* Replaced body zone magic strings with defines
* merge conflicts
2018-03-19 21:18:57 -05:00
Jordan Brown
f9353da855
Quote the armor lists
2018-02-16 00:26:26 -06:00