cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-23 05:08:54 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
1391 Commits
Author SHA1 Message Date
Enric Gabriel ef96fd6389 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-11 18:51:33 -03:00
siliconsandGitHub 89f246db39 Merge pull request #13373 from BlueWildrose/why_my_hood_no_color 
Fixed toggleable polychromic hoods/helmets not polychroming with their suit
 2020-09-11 14:14:16 -07:00
Blue Wildrose 680872e08b 100% less band-aidy polyhood solution 2020-09-10 21:02:27 -07:00
Enric Gabriel 242400a5d6 push the files 2020-09-07 20:40:03 -03:00
Enric Gabriel 38c0f8efbd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-07 18:21:54 -03:00
Ghommie 4a04b22b72 Turf visuals fix plus corrected names of a couple things. 2020-09-06 18:53:01 +02:00
Enric Gabriel c10471fac9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 01:42:29 -03:00
siliconsandGitHub 16fec8831a Merge pull request #13230 from Detective-Google/reskin-obj 
reskin_obj is now a radial
 2020-08-29 21:33:28 -07:00
Detective-GoogleandGitHub 9f7a358bb9 plasmamen are playable now 2020-08-27 11:37:13 -05:00
Enric Gabriel d5a07af36d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-23 22:25:23 -03:00
siliconsandGitHub 64968bd655 Merge pull request #13242 from Literallynotpickles/coat-sensors 
lets you equip handheld crew monitors on all med winter coats
 2020-08-23 17:41:10 -07:00
Enric Gabriel 817fbf5e37 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-23 21:36:10 -03:00
siliconsandGitHub 82d8b7266f Merge pull request #13238 from Hatterhat/insidious-tackle 
insidious combat gloves but they can tackle now
 2020-08-23 17:36:03 -07:00
Enric Gabriel 78124ace3f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-23 12:54:24 -03:00
siliconsandGitHub 7f942abef2 Merge pull request #13239 from zeroisthebiggay/fetishglovesbelike 
zero adds black fetish gloves because hes Horny
 2020-08-23 05:08:14 -07:00
Suicidalpickles 811a6708df h 2020-08-22 18:01:18 -07:00
Enric Gabriel f759503b49 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-22 20:30:49 -03:00
siliconsandGitHub c7c74e7c51 Merge pull request #13213 from lolman360/breath 
breath mask balaclava
 2020-08-22 15:22:04 -07:00
zerothebigboy 21836b4ec8 : ) 2020-08-22 18:11:03 -04:00
Hatterhat 8645a2954f tackle hando 2020-08-22 16:13:41 -05:00
Detective Google 0fbd27fcfb reskin_obj is now a radial 2020-08-21 14:57:11 -05:00
Ghommie fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
lolman360 4259332cfd e 2020-08-19 18:37:31 +10:00
Enric Gabriel 730f93a9cb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-15 00:10:02 -03:00
Sishen bb94bf25fb e 2020-08-13 21:39:00 -06:00
Enric Gabriel 7929924d4a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-11 13:04:34 -03:00
siliconsandGitHub a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch 
adds a cybernetic eyepatch to the syndicate uplink
 2020-08-11 01:47:32 -07:00
siliconsandGitHub 2d01c4db5b Merge pull request #13106 from zeroisthebiggay/cesuitgoclick 
ce hardsuit no longer requires a jumpsuit to actually be fully radproof
 2020-08-11 01:43:54 -07:00
siliconsandGitHub 5694923d89 Merge pull request #13095 from lolman360/liver 
custom name/desc ring and necklace
 2020-08-11 01:41:48 -07:00
zerothebigboy 9baedbd904 a 2020-08-10 10:08:25 -04:00
zerothebigboy cf75f7d4b6 a 2020-08-10 10:08:15 -04:00
Enric Gabriel bae8c236f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-09 18:34:33 -03:00
lolman360andGitHub c9de596fde Verified! 2020-08-09 15:31:49 +10:00
lolman360 50448549fb ee 2020-08-09 15:26:08 +10:00
Enric Gabriel 55a116fd76 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-07 21:24:04 -03:00
Lynxless 14e35806b9 I hope this works 2020-08-07 16:23:15 -03:00
siliconsandGitHub 1586625e6b Merge pull request #12960 from timothyteakettle/loadout-you-say 
loadout changes part 1: adds subcategories to the loadout
 2020-08-06 21:59:13 -07:00
Enric Gabriel 8558cc8747 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-04 01:48:59 -03:00
Timothy Teakettle 5f8ed3ee3a acidproof 2020-08-03 22:14:42 +01:00
Timothy Teakettle 3a0b34fb1b funny aim go brr 2020-08-03 21:58:58 +01:00
Timothy Teakettle 6fdfc19ea0 why can i not spell 2020-08-03 17:39:45 +01:00
Timothy Teakettle da05108dd0 woops 2020-08-03 17:37:58 +01:00
Timothy Teakettle 2153f9ea35 i too, want people to be hit their ricochets 2020-08-03 17:36:40 +01:00
Timothy Teakettle 34e2bd626f woops 2020-08-03 14:50:19 +01:00
Enric Gabriel 656dbe6d06 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-02 17:41:21 -03:00
Timothy Teakettle 0bf9553eca hmm 2020-08-02 19:13:39 +01:00
Timothy Teakettle 289c186f32 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-08-02 18:11:07 +01:00
Timothy Teakettle 03d01d917f Merge branch 'master' into wounds-part-2 2020-08-02 18:10:31 +01:00
siliconsandGitHub 06f5ce6401 buffs shoving (#12925) 
* ^w^

* ok

* ok
 2020-08-02 18:30:09 +02:00
Enric Gabriel c0e884b3a9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-07-29 20:25:36 -03:00