cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-22 04:07:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
84 Commits
Author SHA1 Message Date
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
BongaTheProto 79fa770ab3 Merge remote-tracking branch 'upstream/master' 2022-10-13 11:21:32 -05:00
SandPoot 5384cb9d4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-12 22:25:25 -03:00
shellspeed1 3dace329be adds public bounty consoles without inflation, also removes the mint 2022-09-17 19:27:40 -07:00
BongaTheProto d151f761e7 some adds 2022-05-18 19:18:08 -05:00
BongaTheProto 479b497b00 ok 2022-04-19 01:30:44 -05:00
AManWithAToolbox dda0869f82 Merge branch 'pr/1' into its-wasnt-gonna-happen 2022-04-18 23:19:18 -05:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
TemptStationandnullfag 9b63431a50 Merge pull request #5 from NullFag/kill_me 
smexi fix
 2022-04-15 00:40:12 +02: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 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot f1f6ac0109 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-31 22:14:23 -03:00
Letter NandGitHub bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 32a6e63698 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-27 23:11:54 -03: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
SandPootandGitHub f5f1033803 Tries to make it so alt titles aren't just a challenge and broken (#181) 
* Upload files

* Upload portable_turret.dm
 2021-09-13 21:06:57 -03:00
zerothebigboy c8ebe720ec k 2021-05-05 18:25:05 -04:00
zerothebigboy 5138d86655 skylarlineman'safurry 2021-05-05 03:35:25 -04:00
Hatterhat cbc19c7e91 depcards not in lockers 2021-01-23 19:37:39 -06:00
Letter N 2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
Timothy Teakettle 0184739005 undo the woopsy 2020-07-15 19:53:37 +01:00
Timothy Teakettle 8de062adbb fix 2020-07-13 19:46:51 +01:00
Timothy Teakettle 02f46322ad port examine 2020-07-09 18:32:45 +01:00
SmArtKarandGitHub 29ff6fc464 Updating ID Icons (#12535) 
* Mid-process

* ID updates
 2020-06-16 16:23:17 -07:00
GhomandGitHub 7dc7961b70 Clearing gc issues for a couple objects. (#12508) 
* Clearing gc issues for a couple objects.

* Linter check.
 2020-06-12 17:07:36 -07:00
Ghommie 62418ced9d floor 2020-05-13 03:50:27 +02:00
Ghommie 88e499a39a Some quick economy fixes and improvements. 2020-05-13 03:31:16 +02:00
Ghommie a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
kevinz000andGitHub 269db0c7d6 Identification components + chameleon clothing from uplink is now obfuscated (#12045) 
* fine we'll use components

* syndie kits

* Whew

* examine

* flags

* whew

* compile

* fix

* fix

* ok

* ok

* ok

* done
 2020-05-01 18:39:45 +02:00
Ghommie fecf6cef2f Coin can be inserted in ID cards now. 2020-04-25 14:22:49 +02:00
Ghommie e0d219650f Ready for testing. 2020-04-21 01:26:34 +02:00
Ghommie 96b64009d0 Oh, nullspace. 2020-04-18 03:44:49 +02:00
Ghommie 3dab97b62f I set amount instead of max_amount to INFINITY, that's why it hanged. 2020-04-17 21:52:08 +02:00
Ghommie 4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Ghommie fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
GhomandGitHub 071c3a143f Update cards_ids.dm 2020-02-13 18:13:14 +01:00
GhomandGitHub 1628934b9f Update cards_ids.dm 2020-02-13 18:00:12 +01:00
ArturlangandGitHub 29207b22fb Merge branch 'master' into debug_outfit_updates 2020-02-09 22:05:26 +02:00
Artur c9dc35fd9a Updates the debug outfit 2020-02-06 18:42:23 +01:00
Putnam 53cad493a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul 2020-02-03 03:17:23 -08:00
Ghommie 188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Putnam c58b4daa35 collectors too 
this doesn't compile but like. it's a draft
 2020-01-24 11:58:58 -08:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie 3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Ghommie a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Ghommie 63da5ffb13 ID console fixes and other tweaks. 2019-11-11 17:10:14 +01:00
Ghommie 29584aff69 emagged travis now succeeds. 2019-10-24 23:11:18 +02:00