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 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,280 Commits 55 Branches 0 Tags
7737e76b32c5968c5913a0ea2838a4952cb7b016
Commit Graph

24519 Commits

Author SHA1 Message Date
silicons
7737e76b32 Merge pull request #13224 from Ghommie/Ghommie-cit835 
Removing priority overlays, update_icon() splitup for guns.
 2020-08-22 15:19:07 -07:00
silicons
5c09004dc1 Merge pull request #13228 from DeltaFire15/apc-ui-access-fixes 
Fixes silicons and ratvarians accessing APCs
 2020-08-22 15:19:00 -07:00
DeltaFire
bf799472d1 fixes the APC access check 2020-08-21 19:35:58 +02:00
zerothebigboy
5d611155f1 a 2020-08-21 02:15:30 -04:00
zerothebigboy
5741db4a13 Merge branch 'thefunnytemporalkatanas' of https://github.com/zeroisthebiggay/Citadel-Station-13 into thefunnytemporalkatanas 
# Conflicts:
#	code/game/objects/items/weaponry.dm
 2020-08-21 02:13:44 -04:00
zerothebigboy
a9abdeb044 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into thefunnytemporalkatanas 2020-08-21 02:10:03 -04:00
zerothebigboy
421e32f3f9 a final touch up 2020-08-21 02:06:36 -04:00
zerothebigboy
cca7e66457 a slight blink flavor 2020-08-21 01:54:09 -04:00
zeroisthebiggay
a183fb3165 Update weaponry.dm 
thats an extra space
 2020-08-21 01:45:23 -04:00
zeroisthebiggay
7f036428bd Update weaponry.dm 
thats an extra space
 2020-08-21 01:40:19 -04:00
zerothebigboy
b960f4055d a 2020-08-21 01:31:30 -04:00
silicons
120bcfc00c Merge pull request #13178 from lolman360/plumb 
[READY] ports plumbing (no more waiting for tgui4)
 2020-08-20 21:32:26 -07:00
Ghom
cd10655985 fix 2 2020-08-20 23:02:13 +02:00
Timothy Teakettle
88fb9d277a fix lizard snouts (#13223) 2020-08-20 22:58:54 +02:00
Ghommie
c39764afde Merge branch 'Ghommie-cit835' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit835 2020-08-20 20:28:46 +02:00
Ghommie
921a963e59 fix 1 2020-08-20 20:26:29 +02:00
Ghom
1242626faa Forgot the comment. 2020-08-20 19:01:13 +02:00
Ghommie
fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
silicons
11467e1cae Merge pull request #13212 from Putnam3145/reftrack 
Ports reftracking from TG.
 2020-08-19 22:03:16 -07:00
silicons
91484356c5 Merge pull request #13183 from SmArtKar/shuttle_hotfix 
Shuttle hotfix so now you can make huge shuttle things
 2020-08-19 21:03:58 -07:00
silicons
0e2e4fdaf7 Merge pull request #13199 from lolman360/haha 
[READY] tested code
 2020-08-19 21:03:21 -07:00
silicons
8a1cf1b860 Merge pull request #13208 from timothyteakettle/fuck 
fixes two snout paths
 2020-08-19 19:56:12 -07:00
silicons
5414a8949c Update text.dm 2020-08-19 08:50:26 -07:00
DeltaFire
7a9796e782 minmax torture 2020-08-19 17:05:27 +02:00
silicons
747c2af995 Merge pull request #13210 from Hatterhat/pirate-bruh-moment 
>pirate announce metabreaks >in the year of our Lord 2020
 2020-08-19 06:59:36 -07:00
lolman360
1654a925b6 Update smoke_machine.dm 2020-08-19 18:26:53 +10:00
lolman360
e82772dc44 kekw 2020-08-19 17:22:52 +10:00
Putnam
81dc6c7ee5 Ports reftracking from TG. 2020-08-18 20:41:43 -07:00
Hatterhat
0c4a3c740d >metabreaks >2020 2020-08-18 21:50:57 -05:00
Putnam3145
cc99a89027 Merge pull request #13206 from Citadel-Station-13/silicons-patch-18 
[s] xss
 2020-08-18 19:24:14 -07:00
lolman360
ee4da21d38 Merge branch 'haha' of https://github.com/lolman360/Citadel-Station-13 into haha 2020-08-19 12:20:38 +10:00
lolman360
f35989b09e Merge remote-tracking branch 'upstream/master' into haha 2020-08-19 12:20:07 +10:00
timothyteakettle
b40a42209d fixes two snout paths 2020-08-19 03:19:51 +01:00
Letter N
fa7b82694d src.islazy = TRUE 2020-08-19 10:04:56 +08:00
lolman360
5306da7938 Update code/modules/projectiles/guns/ballistic.dm 
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
 2020-08-19 12:02:53 +10:00
lolman360
09bba25050 Update code/modules/projectiles/boxes_magazines/_box_magazine.dm 
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
 2020-08-19 12:02:45 +10:00
lolman360
a7a964154e Update code/modules/projectiles/boxes_magazines/_box_magazine.dm 
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
 2020-08-19 12:02:34 +10:00
Letter N
b59d449a75 Update adminhelp.dm 2020-08-19 09:59:41 +08:00
silicons
48652e4b0a Merge pull request #13202 from tiramisuapimancer/master 
Makes Ethereal hair their mutcolor instead of white
 2020-08-18 18:53:40 -07:00
silicons
04a0c2be6c Merge pull request #13194 from DeltaFire15/slab-wiki 
Updates the clockcult help link to link to our wiki.
 2020-08-18 18:53:21 -07:00
silicons
0331f0cdc3 Merge pull request #13189 from timothyteakettle/revert-13187-revert-13110-cum 
Revert "[TESTMERGE ONLY] FUCK"
 2020-08-18 18:52:52 -07:00
silicons
ce80f64d27 Update suppression.dm 2020-08-18 18:52:06 -07:00
lolman360
e00c383b1a Update belt.dm 2020-08-18 20:19:54 +10:00
lolman360
7390effcb9 e 2020-08-18 19:09:01 +10:00
lolman360
36bcc3a869 Merge branch 'plumb' of https://github.com/lolman360/Citadel-Station-13 into plumb 2020-08-18 18:57:35 +10:00
lolman360
b466a5aae9 e 2020-08-18 18:57:23 +10:00
lolman360
4e23559065 Update sheet_types.dm 2020-08-18 18:15:24 +10:00
lolman360
9931cb006c eee 2020-08-18 17:33:20 +10:00
tiramisuapimancer
13609ba6e6 Update ethereal.dm 2020-08-17 23:01:01 -08:00
lolman360
d8e286d7be ee 2020-08-18 16:17:00 +10:00