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-14 11:52:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,847 Commits 55 Branches 0 Tags
caed4b51b9ed1bf80dd1cae3bcdc1c1f7deb8a08
Commit Graph

1482 Commits

Author SHA1 Message Date
Lin
c022956c75 Merge pull request #13725 from silicons/anti_collision_bindings 
makes keybind system automatically generate anti-collision keybinds where necessary to avoid unintentional macro fires
 2020-12-15 21:24:30 +00:00
Lin
0d95172bef Merge pull request #13749 from Citadel-Station-13/silicons-patch-7 
fixes nonsensical verb
 2020-12-12 20:00:41 +00:00
silicons
8af8063e73 Update input.dm 2020-12-10 13:39:22 -07:00
Timothy Teakettle
132a3c9526 color non polychromic items 2020-12-08 19:29:34 +00:00
Timothy Teakettle
ac9e383638 WOOPS ONE MORE DEBUG MESSAGE 2020-12-07 21:28:17 +00:00
timothyteakettle
61cc33d995 Merge remote-tracking branch 'upstream/master' into loadout-json 2020-12-06 17:26:04 +00:00
timothyteakettle
0f540884eb Merge branch 'master' into loadout-json 2020-12-06 17:24:24 +00:00
timothyteakettle
5566c00a69 fixes 2020-12-06 17:24:12 +00:00
timothyteakettle
a478da678e bugfixes 2020-12-06 15:50:33 +00:00
timothyteakettle
fa26f4c402 b 2020-12-06 00:02:14 +00:00
Timothy Teakettle
afdbac31fa test 2020-12-05 22:35:27 +00:00
silicons
8d7f3aebc4 sigh 2020-12-02 09:20:23 -07:00
silicons
a6d73e0344 fix 2020-11-27 04:25:22 -07:00
silicons
9f4e0ac4df woops 2020-11-26 23:38:39 -07:00
silicons
5e965d099f COME ON 2020-11-26 23:37:27 -07:00
Timothy Teakettle
285208ece3 Merge branch 'master' into communication-hotkeys 2020-11-22 21:30:43 +00:00
timothyteakettle
60077f028e port 2020-11-17 01:41:19 +00:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
Artur
503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
silicons
2d842270f5 Merge pull request #13625 from LetterN/revert-12994-patch-37 
Reverts this circuit frame removal
 2020-10-28 07:53:15 -07:00
silicons
e672ee847e Merge pull request #13592 from Putnam3145/stat-voting-tweaks 
Adds ranked choice ballots to stat voting
 2020-10-28 07:41:43 -07:00
silicons
a3228b3366 Merge pull request #13593 from Putnam3145/add-all-vote-types-to-maps 
Stringified the vote #defines for easier config stuff
 2020-10-28 07:41:35 -07:00
timothyteakettle
b1379dd49e still not working 2020-10-27 21:11:42 +00:00
timothyteakettle
e35b3e4a33 color editing 2020-10-26 00:47:40 +00:00
Timothy Teakettle
0c2e1997ce more loadout 2 2020-10-25 22:49:39 +00:00
Letter N
3d2bd4a98e Revert "removes dildo" 2020-10-25 12:55:04 +08:00
timothyteakettle
a39dea1b4d json loadout 2020-10-24 00:31:45 +01:00
Putnam
558d11bc73 Stringified the vote #defines for easier config stuff 2020-10-18 14:49:43 -07:00
Putnam
07a02617c2 Fixed compiler errors, runtimes 2020-10-18 12:51:00 -07:00
Putnam
00b4d207c5 Added ranked choice ballots to stat voting. 2020-10-18 12:32:45 -07:00
Ghommie
c0f3317c01 mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port. 2020-10-16 20:27:09 +02:00
Tupinambis
3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05:00
BlackMajor
313970000b Merge pull request #13522 from silicons/async 
Fixes the intermittent master controller lockups
 2020-10-11 18:48:37 +13:00
BlackMajor
bf7d68884b Merge pull request #13510 from silicons/google 
a more sane json-based map override system for jobs (todo port to rp so rp can have map rotation)
 2020-10-11 18:39:10 +13:00
silicons
2919dfee2e Merge pull request #13014 from Hatterhat/tendril-minimum 
[REVIEW PLEASE] Minimum Megas/Tendrils For Lavaland But Cleaner I Swear
 2020-10-10 21:58:15 -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
03a47bda6d Merge pull request #13252 from timothyteakettle/loadout-loading 
qol: looking at loadout equips your loadout items on you instead of job items
 2020-10-06 16:50:08 -07:00
silicons
7c07863179 fix 2020-10-05 13:29:53 -07:00
Letter N
1b30fbf703 Update statpanel.dm 2020-10-05 20:07:04 +08:00
Letter N
ea48dd1e2e part 2 2020-10-05 20:02:12 +08:00
Timothy Teakettle
46ebb72905 Merge branch 'master' into loadout-loading 2020-10-04 01:43:17 +01:00
silicons
21d3d8fcd9 sigh 2020-10-03 14:17:13 -07:00
Letter N
d6beeffad5 reverts this regression 2020-10-03 20:26:32 +08:00
Letter N
47845f2c30 suposed to be SSupdates but noo 2020-10-03 19:54:23 +08:00
Hatterhat
0310e3ebd5 please travis stop crashing on me 2020-10-01 19:10:13 -05:00
Tupinambis
d2860b38c7 normalization 2020-10-01 18:46:31 -05:00
Tupinambis
f1bc1ccafb Merge branch 'master' into spooder 
# Conflicts:
#	code/modules/surgery/organs/eyes.dm

I have no idea if this will work
 2020-10-01 17:10:42 -05:00
Tupinambis
a3a5fe4c2d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into spooder 2020-09-30 16:07:21 -05:00
Tupinambis
113b84ab50 Ports arachnids from WaspStation 2020-09-30 15:10:17 -05:00
Zandario
9104e2c041 Revert "C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA" 2020-09-29 15:40:12 -05:00