Commit Graph

101 Commits

Author SHA1 Message Date
SandPoot
221c059435 there's gonna be so many commit logs. hopefully this is the last. 2021-03-10 01:34:25 -03:00
SandPoot
024d0ec692 admins should be able to see, and anyone else shouldn't break it, and i probably need sleep 2021-03-10 01:18:31 -03:00
SandPoot
3b0ebc0b80 cyborgs were messed up too 2021-03-10 01:03:31 -03:00
SandPoot
7b35a33d58 upload machine_interactions.dm 2021-03-10 00:33:11 -03:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Ghommie
90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
Letter N
7c7d635193 what if atmos relief works? and all the other ui's gets updated 2020-08-04 12:54:55 +08:00
silicons
bc823b544f sigh 2020-07-29 01:17:16 -07:00
zerothebigboy
ee2de61b17 a 2020-07-26 06:27:30 -04:00
zerothebigboy
40d12fd02f a 2020-07-26 06:20:06 -04:00
Artur
e6dee77b79 Telecomms fixes 2020-06-30 17:01:54 +03:00
Artur
ec3c15ef0d TCOMMS porting 2020-06-09 11:24:08 +03:00
Artur
b6dc41b852 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-09 11:07:39 +03:00
Letter N
1fc73700c5 Telecomms TGUI (#12145)
* aaaaaa

* branch hell

* time to sync

* build

* adds more """functionality""" for telemonitor

* messaging pda thing

* bakes tgui

* someone didn't finish the code for req. consoles

* go use [TELECOMM STUFF].on, it's better

* build stuff

* a

* interface for teleinteraction

* tgui

* ready for launch - not tested yet

* build

* built ui

* bitflag readability and bye oldcode!

* bepis

* build ui
2020-06-01 00:22:40 +02:00
Artur
3c973816d1 Ports https://github.com/tgstation/tgstation/pull/51125/ 2020-05-27 12:48:25 +03:00
Ghommie
2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
TrilbySpaceClone
bfa83591df what if we made upgrading them more usfull 2020-04-06 07:35:36 -04:00
Ghommie
41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Putnam
3cba19dea7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stop-lag 2020-03-02 11:24:49 -08:00
Putnam
eefba5ce00 Removes lag 2020-03-02 11:24:46 -08:00
Ghommie
fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
kevinz000
7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
Ghommie
c34714cb90 Something about the in operator and spaceDMM version update. 2020-02-10 07:37:59 +01:00
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Seris02
18489e5b65 merge fixes 2020-02-02 11:51:26 +08:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Seris02
74be93a8cc hasSiliconAccessInArea vars change 2020-01-21 11:44:49 +08:00
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
Ghommie
268146bb93 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit374 2020-01-12 17:19:57 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghom
110361f82b web-lazy-edit
I'm on another branch
2019-12-30 16:18:42 +01:00
Ghommie
4640d8495d ) 2019-11-27 05:14:08 +01:00
Ghommie
1f69679cfb Ports a few telecomms updates and fixes. 2019-11-27 04:58:05 +01:00
Ghommie
da56a33e43 stuff 2019-11-19 01:02:54 +01:00
Ghommie
f6b06a878c Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook" 2019-11-19 00:50:18 +01:00
Ghommie
64ce8460c0 a comma. 2019-09-22 14:53:02 +02:00
Ghommie
ff451c8cf4 I don't want to send emoji assets to every machine interfacing with PDA messages.
Just the chat tab.
2019-09-22 14:50:37 +02:00
Ghommie
0513f3464a one 2019-06-05 19:20:25 +02:00
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
kevinz000
2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05: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
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Dax Dupont
4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00