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 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,205 Commits 55 Branches 0 Tags
ab827ff8dc87142da023bb46bc703b17a1ab65b5
Commit Graph

64 Commits

Author SHA1 Message Date
deathride58
b02372afb0 minimap refresh - high-detail, JS fixes, pixel-perfect scaling, and more! 2022-06-04 22:44:15 -04:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
Artur
8d977e3042 Fucking init 2021-07-30 01:40:00 +03:00
Artur
2a670dcd43 This should fix it, why does our init update icons and not TG's? 2021-07-30 01:28:10 +03:00
Artur
dc40dfca81 goddamn stupid runtimes 2021-07-30 01:24:43 +03:00
Putnam
8d96de6b03 More tweaks, whoops 2021-05-06 14:52:17 -07:00
silicons
939a493334 Merge pull request #14306 from Putnam3145/supernova 
Adds a supernova event, with tweaks to allow this
 2021-03-10 01:32:52 -07:00
Putnam
311d766bd5 Adds a supernova event, with tweaks to allow this 2021-02-24 02:56:14 -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 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
Letter N
45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
Letter N
10fefca674 another batch. MAJOR: chem_master, pandemic 2020-07-30 14:06:20 +08:00
Artur
3c973816d1 Ports https://github.com/tgstation/tgstation/pull/51125/ 2020-05-27 12:48:25 +03:00
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Artur
80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghommie
f6db5764e3 Bringing back accidentally reverted solar panel fixes. 2020-04-06 18:20:34 +02:00
Artur
f8469c89a4 Conflict fix 2020-02-25 10:46:20 +02:00
Artur
528a226dae Done. 2020-02-24 13:36:55 +02:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Artur
e08c89ce48 Reverts some 2020-02-21 15:10:39 +02:00
Artur
5d76d33683 Merge remote-tracking branch 'Upstream/master' into Solar_updates 2020-02-20 13:15:46 +02:00
Ghommie
e053721820 Fix for solar panels/trackers being wonky. 2020-02-14 07:15:13 +01:00
Artur
cf22596477 Reworks solars 2020-02-07 10:59:43 +02:00
Ghommie
a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Artur
e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01:00
Ghommie
ddf037da92 Trilby's solar panels PR but improved. 2020-01-21 00:28:41 +01:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
Tad Hardesty
021f30f0c0 Fixed stacks sometimes having the wrong amount if created on another stack 2018-05-11 17:30:32 -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
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
CitadelStationBot
001dbde0c9 [MIRROR] Sexy Solar Sprites (#5191) 
* replaced solar panel sprites with better ones

* Sexy Solar Sprites
 2018-01-30 07:23:46 -06:00
Dax Dupont
0ebd16f509 Solar control fixes (#33985) 
* Solar fixes

* Also removing the solcon-o icon
 2018-01-02 08:21:16 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00
CitadelStationBot
76f7fcef9a [MIRROR] Cleaned up paper varedits + tidied up paths (#2156) 
* Cleaned up paper varedits + tidied up paths

* work smarter, not harder

* citadel snowflake

* Update uplink_item_cit.dm
 2017-08-02 03:17:32 -05:00