keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
LetterN
fab4b07be5
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-12-21 07:59:33 +08:00
DeltaFire
50be57f107
grrrr
2021-12-08 18:33:06 +01:00
keronshb
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04:00
LetterN
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
LetterN
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
keronshb
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
LetterN
f7b898a2a9
frontend
2021-10-28 17:34:52 +08:00
Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
keronshb
0bae06adcd
Original Port
2021-10-11 22:00:54 -04:00
SandPoot
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
Artur
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
Letter N
4463fd9513
paperwork mini update, also ASS_BLAST_USA
2021-03-06 19:28:29 +08:00
Letter N
5304029dd9
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-23 11:01:42 +08: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 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
Letter N
45d6a5f87f
it compiles, UNTESTED YET
2021-02-13 21:41:59 +08:00
Letter N
5db87b9065
more updates!
2021-02-12 17:52:59 +08:00
Artur
16e0b85b44
More funshit
2021-01-20 18:23:28 +02:00
Artur
3737c52df8
Funny actions
2021-01-20 15:23:34 +02:00
silicons
0bb0f89ca2
Update pen.dm
2021-01-03 18:03:36 -07:00
silicons
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
silicons
3629addf0f
Update ticketmachine.dm
2020-09-17 04:37:10 -07:00
silicons
cffc321050
more
2020-09-15 17:27:50 -07:00
Ghommie
dc9b024fae
Blemishes begone.
2020-09-02 19:16:16 +02:00
Letter N
ae482c1bb8
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-29 14:09:56 +08:00
EmeraldSundisk
e0b70da487
Update paper_premade.dm
2020-08-23 20:53:52 -07:00
Letter N
b20f63ea21
absolute head empty moment
2020-08-22 17:11:53 +08:00
Letter N
271c66ad40
travis moment
2020-08-22 17:03:10 +08:00
Letter N
6ba29acd4e
uses some cit procs. and how the fuck did i forget to componentualize this
2020-08-22 16:08:05 +08:00
Letter N
8d70e21239
the unexpected paperwork update. paperwork rp? And also includes ntnet upgrade because fuck it.
2020-08-20 19:40:47 +08:00
Letter N
2dd3d71b19
config©paste chang.
2020-08-20 16:36:24 +08:00
silicons
5694923d89
Merge pull request #13095 from lolman360/liver
...
custom name/desc ring and necklace
2020-08-11 01:41:48 -07:00
lolman360
50448549fb
ee
2020-08-09 15:26:08 +10:00
Letter N
333ca2cc7b
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-06 18:26:04 +08:00
Letter N
b376a6b6c4
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-07-30 14:43:52 +08:00
Letter N
0805265412
yet another batch. MAJOR: APC
2020-07-30 12:54:53 +08:00
Timothy Teakettle
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
Lin
81a7542aa6
Merge pull request #12834 from silicons/clickcd_experimental
...
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
Ghommie
f1c242aadc
Fixing new bugs and stuff.
2020-07-27 14:16:01 +02:00
timothyteakettle
8360bb1a7f
section 2
2020-07-24 23:44:57 +01:00
Timothy Teakettle
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
silicons
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
silicons
3d2995b4e8
Merge pull request #12787 from CameronWoof/advanced-sutures-and-mesh
...
Ports Medicated Sutures and Advanced Regenerative Mesh from TG
2020-07-20 17:01:32 -07:00
silicons
526d257410
fix
2020-07-20 11:48:08 -07:00
silicons
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
silicons
58e26c540c
merge from master
2020-07-20 10:18:44 -07:00
silicons
1a040dd2a6
changes
2020-07-18 18:44:17 -07:00
