SandPoot
789534ac63
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-07-28 18:36:03 -03:00
SandPoot
11aa13e4e8
part 1 - 41928
2023-07-26 21:45:43 -03:00
SandPoot
7038059ab5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-05-06 10:47:06 -03:00
KrissKr0ss
66aa1cb05c
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
...
This reverts commit 48e713ff33 , reversing
changes made to efb2d19cb9 .
2023-05-01 00:16:20 -05:00
SandPoot
7cc1ecfa1e
(i'm being shot by those red arrows help)
2023-04-06 18:49:21 -03:00
SandPoot
11a06b1686
pixelshift + layering
2023-02-21 14:27:10 -03:00
SandPoot
992d25ea08
Revert "pixelshift + layering"
...
This reverts commit 51818478c5 .
2023-02-21 14:25:29 -03:00
SandPoot
51818478c5
pixelshift + layering
2023-02-21 14:20:48 -03:00
SandPoot
d743096f8a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-09 17:50:19 -03:00
Jerry Wester and GitHub
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
SandPoot
82eff346c7
Merge Upstream
2023-01-07 22:52:22 -03:00
PeriodicChaos and Jerry Wester
b538ad721b
modsuits part 2
2022-12-11 20:30:58 -07:00
SandPoot
f039efca97
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-27 01:19:55 -03:00
shellspeed1
f2ed6a571c
this gets it to the point it compiles
2022-09-09 18:04:52 -07:00
shellspeed1
fbc80cf829
initial port
2022-09-09 00:29:20 -07:00
silicons and GitHub
9a17ef3bf2
Merge pull request #15663 from deathride58/blockquotes
...
Blockquotes for chat; Prettier examine text and more!
2022-06-10 22:09:12 -07:00
SandPoot
be1357bdb0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-07 17:29:38 -03:00
deathride58
04a0a3b869
chat blockquotes; prettier examine text and more!
2022-06-03 18:55:18 -04:00
deathride58
ce3fac30d6
Fully restores the functionality of audiovisual redirection
2022-06-03 14:31:12 -04:00
SandPoot
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
SandPoot
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -03: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
a8f454bd72
Upload files
2022-03-16 14:00:31 -03:00
SandPoot and GitHub
e466f47992
Replaces infoboxes with examine blocks ( #235 )
2022-03-14 14:22:18 -03:00
SandPoot
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
keronshb
3ea22f97a6
Merge remote-tracking branch 'upstream/master' into ambitioncheck
2022-02-22 17:10:25 -05:00
SandPoot
7523279254
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-07 22:07:59 -03: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
SandPoot
9a633b5395
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-12-31 14:07:43 -03:00
SandPoot and GitHub
8510dcc08a
Ports tgui stripping (finally) ( #15401 )
...
* Upload files
* Update items.dm
* Update files
* Update files
* Update strippable.dm
* Update strippable
* Update strippable.dm
* Upload files
* Update files
* Update files
* Update files
* update files
* Update files
* Update dog.dm
* Update strippable.dm
* Update equipping
* Update strippable.d
* Upload files
* Upload files
* Update monkey.dm
2021-12-30 07:40:15 +01:00
keronshb
83a62ace04
Ambitioncheck
2021-12-23 21:15:31 -05:00
SandPoot
bc21dc3acb
quick-mess
2021-12-12 16:12:11 -03:00
SandPoot
d55d628efe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-08 21:34:03 -03:00
SandPoot and GitHub
1b851c4826
Thirst rework ( #184 )
2021-10-02 22:29:34 -03:00
keronshb
6cc4e35b44
Mob lists
2021-09-19 13:28:41 -04:00
SandPoot
e738c3cf21
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-08-27 12:40:48 -03:00
keronshb
7070a848b6
Item Highlight Port
2021-08-22 00:21:06 -04:00
SandPoot
ab9b824ce9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-08-08 14:18:09 -03:00
Artur
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
SandPoot
d863f9f437
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-06-27 15:54:58 -03:00
Putnam
3b25f3e199
Started expanding auxgm a bit
2021-06-10 04:40:23 -07:00
SandPoot and GitHub
6f15641f33
Thirst ( #151 )
...
* upload files
* upload files
* upload examine.dm
* Update modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
2021-04-03 19:54:56 -03:00
Fabian
8178b7073a
It's done, atleast the code is
2021-03-05 21:50:29 +01:00
Fabian
2f1aba4f80
Revert "i can't believe kevin made me code"
...
This reverts commit 7f38564838 .
2021-03-05 21:19:59 +01:00
Fabian
7f38564838
i can't believe kevin made me code
...
im taking severe offense to this
2021-03-05 19:55:53 +01:00
SandPoot
766493cc16
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-12-22 18:03:33 -03:00
DeltaFire and GitHub
d3f30d21cf
Merge pull request #13772 from silicons/respawn_system_2
...
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
2020-12-22 17:40:33 +01:00
DeltaFire and GitHub
65c14cf289
Merge pull request #13537 from silicons/permissions
...
support update for event manager permissions
2020-12-22 16:12:03 +01:00
silicons
45a7c68da1
wow
2020-12-11 15:05:00 -07:00