BongaTheProto
e3d1286cb8
Merge remote-tracking branch 'upstream/master'
2023-11-23 17:23:16 -05:00
DeltaFire
7bb6d4ca08
another layer
2023-11-13 11:46:21 +01:00
DeltaFire
7d734b11c2
Merge remote-tracking branch 'upstream/master' into powernet-optim
2023-11-13 11:38:50 +01:00
Comicao1
f06e1e3cd4
aye
2023-04-05 17:31:20 -03:00
Comicao1
d9e21a7784
Fixes
2023-04-05 16:07:18 -03:00
Comicao1
3941dd22a5
Final
2023-04-03 18:41:16 -03:00
Comicao1
f15d842238
Go on
2023-03-24 16:42:39 -03:00
Comicao1
2e08664b28
Last fixes
2023-03-23 15:41:32 -03:00
Comicao1
eea7bbd582
Done
2023-03-22 18:33:04 -03:00
BongaTheProto
ee6823c69b
Merge remote-tracking branch 'upstream/master'
2022-12-13 12:14:11 -05:00
Lin and GitHub
7205781c47
Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
...
Solves some harddels
2022-12-12 19:11:49 -07:00
SandPoot
8911fe5e0b
clear em
2022-12-11 17:58:45 -03:00
BongaTheProto
9e7c5033cc
Merge remote-tracking branch 'upstream/master'
2022-08-07 21:42:16 -05:00
Putnam3145
b2d816b825
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-08-07 17:59:28 -07:00
BongaTheProto
03f4c65fc4
Merge remote-tracking branch 'upstream/master'
2022-06-11 23:25:29 -05:00
deathride58
b02372afb0
minimap refresh - high-detail, JS fixes, pixel-perfect scaling, and more!
2022-06-04 22:44:15 -04:00
Putnam3145
33889870c9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-05-17 13:22:40 -07:00
BongaTheProto
6ada3f7c94
Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen
2022-04-18 21:36:14 -05:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
Putnam3145
6199aa4d60
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-03-30 12:35:12 -07:00
BongaTheProto
ffcca5c46b
Merge remote-tracking branch 'upstream/master'
2022-02-08 01:16:02 -05:00
silicons and GitHub
af6e43c595
refactors clickcatchers/parallax/fullsceren ( #15460 )
...
* :)
* that
* move those there
* refactor that too
* wew
* stuff
* almost.
* sigh
* just need speed
* stuf
* pain
* hm
* tweaks
* that
* eh
* wack
* a
* done
* that's important
* wacky
* all that
* fixes
* typo
* that
* a
* funny
* that
* that
* woo
* help im losing my fucking mind
* okay
* fix
2022-02-07 15:17:24 -08:00
Putnam3145
629ce5bea6
Station traits
2021-12-08 16:17:35 -08:00
James
9258b93f64
Modularises (most of) the code into EROS module folder
2021-12-05 19:39:24 +00:00
James
738e009078
Adds WIP shuttle / hideout. Adds teleport implant. More slave stuff.
2021-12-04 06:02:40 +00:00
Linzolle
3084ef1231
areas and power and atmos oh my
2021-11-26 20:50:39 -07:00
Linzolle
776f69e119
turfs go in the turfs file and it is too cold
2021-11-26 19:53:33 -07:00
keronshb
5498d7ed13
Reverts unintended area changes to other maps
2021-11-21 10:50:22 -05:00
keronshb
af83fb9611
FestiveMap 2021
2021-11-20 12:04:35 -05:00
Putnam3145
b7b69fdeda
Fixes power alarm not to be precisely wrong
2021-11-07 09:27:13 -08:00
Chayse Ramsay and GitHub
d1611ddf42
Lavaland ruin rad storm fix ( #15242 )
...
* Lavaland rad storm fix
* whoops
* double whoops
* Update Lavaland.dmm
2021-10-06 17:28:29 +02:00
zerothebigboy
c6ce359cda
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# tgstation.dme
2021-09-19 15:23:52 -04:00
zerothebigboy
3c23a09b56
bannedforbeingcringeist
2021-09-07 21:10:24 -04:00
MarinaGryphon and GitHub
9d8f34dd8d
Attempts an optimisation for power_change
...
- Adds an alternate, hopefully faster list iteration method for machines in power_change
- Removes uses of INVOKE_ASYNC for power_change, since it's slower than normal proc calls and does nothing since it doesn't sleep
TODO: Diagnose what the fuck is making power_change so slow anyway.
2021-08-20 16:55:47 -05:00
zerothebigboy
06181f51ae
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# code/modules/ninja/suit/suit.dm
2021-08-19 21:55:22 -04:00
Artur
187f0e4280
update_appearance
2021-07-28 02:13:57 +03:00
zerothebigboy
1a90c96e4b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# icons/mob/clothing/feet.dmi
# icons/mob/clothing/feet_digi.dmi
# icons/mob/clothing/head.dmi
# icons/mob/clothing/mask.dmi
# icons/mob/clothing/mask_muzzled.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/masks.dmi
# icons/obj/items_and_weapons.dmi
2021-06-09 17:40:28 -04:00
silicons and GitHub
a77aa8bd41
Merge pull request #14766 from Linzolle/cultfix
...
Fix cult area shenanigans, cult can do stuff in maint again.
2021-06-09 11:22:26 -07:00
MrJWhit
2db540aae3
Update holodeck.dm
2021-06-04 20:53:34 -04:00
Linzolle
46833abf0b
add cult_permitted area flag
2021-05-27 19:34:00 -05:00
zerothebigboy
5b973d6ef4
..........
2021-05-02 23:36:17 -04:00
zerothebigboy
359c778955
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# code/modules/ninja/suit/ninjaDrainAct.dm
2021-05-02 22:47:39 -04:00
Letter N
935e46b492
The Mapping Update
...
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
zerothebigboy
87eb447c10
some final touch ups
2021-02-10 14:22:04 -05:00
silicons
ddad368d6a
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-08 00:33:57 -08:00
Putnam3145 and GitHub
5cde6e0157
Merge pull request #13871 from silicons/debris
...
Merry Christmas - GIVING JANITORS A JOB
2021-01-08 00:26:52 -08:00
EmeraldSundisk
291c0a0a22
Update Space_Station_13_areas.dm
2021-01-01 22:46:36 -08:00
EmeraldSundisk
b1f76a8566
Update Space_Station_13_areas.dm
2020-12-29 11:38:07 -08:00
EmeraldSundisk
0707f6ecfc
Update Space_Station_13_areas.dm
2020-12-29 10:56:58 -08:00
EmeraldSundisk
6af5d180d0
Update Space_Station_13_areas.dm
2020-12-29 10:29:28 -08:00
BongaTheProto