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-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,663 Commits 55 Branches 0 Tags
1b1efce5561f9f9da39a6b0e121b02f562b2918d
Commit Graph

1748 Commits

Author SHA1 Message Date
silicons
1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07: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
655d505316 Merge pull request #13507 from LetterN/subsystem-updoots 
Ports the better statpannel design, fixes missing icons, and fixes statvoting [ready]
 2020-10-06 00:46:13 -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
silicons
20f1e0818e Merge pull request #13479 from LetterN/another-update-mayhaps 
Fixes minimap, and dmdocs other things
 2020-10-03 18:02:29 -07:00
Timothy Teakettle
46ebb72905 Merge branch 'master' into loadout-loading 2020-10-04 01:43:17 +01: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
silicons
095a6ae008 Merge pull request #13429 from Putnam3145/fix-initial-atmos 
Fixed a dumb typo that may or may not be causing atmos jank.
 2020-10-01 03:03:24 -07:00
silicons
b7650f3dea Merge pull request #13398 from timothyteakettle/wound-config 
wound config values, wound bonus for how damaged a limb is
 2020-10-01 03:02:35 -07:00
Letter N
5418fb5b01 fixes minimaps and cinematic, also adds some dmdoc things 2020-10-01 17:36:56 +08:00
Zandario
9104e2c041 Revert "C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA" 2020-09-29 15:40:12 -05:00
silicons
822f1c9bf3 fix 2020-09-27 03:07:51 -07:00
Putnam
24c48c2bec Adds an "unstuck" step to LINDA 2020-09-25 09:40:32 -07:00
silicons
57c4a3416a Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-25 01:03:15 -07:00
Putnam
650d76ba69 Fixed a dumb typo. 2020-09-23 22:36:12 -07:00
silicons
7ca1b1dc79 Merge pull request #13380 from Putnam3145/cache-locality-experiments 
(TESTMERGE THIS FIRST WOW) Made monstermos faster and more convenient
 2020-09-23 14:39:56 -07:00
Artur
d493886875 Speedmerge fix 2020-09-23 19:14:50 +03:00
silicons
2dddb2253e tweak 2020-09-21 21:03:28 -07:00
silicons
4ab064a50d fix 2020-09-21 20:58:33 -07:00
silicons
31791df2bd fixes 2020-09-21 20:38:43 -07:00
silicons
2c4dc4d1a9 ok 2020-09-21 19:08:21 -07:00
silicons
ddc7f10de7 fixes 2020-09-21 18:35:42 -07:00
silicons
7249fe058f config based 2020-09-21 17:36:30 -07:00
Putnam
e89e7adda4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments 2020-09-21 03:31:35 -07:00
silicons
9fef16964c Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-21 03:13:51 -07:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
silicons
c5403b5ef4 fixes 2020-09-20 02:49:42 -07:00
Ghom
868e464b40 fixes linter issues, removes acid degrading armor (#13399) 
* fix

* more

* Update brawn.dm

* Update ticketmachine.dm
 2020-09-19 15:04:48 +02:00
Artur
74533d3f9d fiiix shit 2020-09-16 11:16:39 +03:00
silicons
ca8b13b86a Merge pull request #13255 from timothyteakettle/limbs 
you can choose limbs to be prosthetic/amputated
 2020-09-16 00:31:18 -07:00
silicons
95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
timothyteakettle
c3bea5f77b wounds 2020-09-15 23:50:26 +01:00
timothyteakettle
7be15afb32 config 2020-09-15 23:20:11 +01:00
Putnam
b06f19cf5c Brought reactions to extools again; now including debug symbols. 
This time they work!
 2020-09-14 19:32:31 -07:00
Putnam
372be3bf5c Fixed all the problems. 2020-09-14 02:37:07 -07:00
Putnam
3ea7f0defa Added a gas mixture counter and fixed a segfault on exit. 2020-09-10 17:42:49 -07:00
Putnam
373f6a1068 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments 2020-09-10 04:57:43 -07:00
Putnam
fb17f0cc75 Somehow made monstermos over 100x as fast 2020-09-10 04:48:55 -07:00
Artur
12fbd67b6d Stupid shit 2020-09-09 21:27:32 +03:00
Artur
ff4c94c2d5 Fixes some verbs and gateway 2020-09-09 21:08:16 +03:00
silicons
07b28f40de Merge pull request #13359 from Ghommie/Ghommie-cit838 
Turf visuals fix plus corrected names of a couple things.
 2020-09-07 13:42:05 -07:00
Ghommie
4a04b22b72 Turf visuals fix plus corrected names of a couple things. 2020-09-06 18:53:01 +02:00
BlackMajor
1943a2fdd7 Merge pull request #13246 from silicons/anomaly_manufacturing 
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
 2020-09-06 17:53:35 +12:00
Timothy Teakettle
8f6c353ad0 memory leak bad 2020-09-05 21:35:02 +01:00
timothyteakettle
cdaef63fa1 sorry travis 2020-09-03 23:07:19 +01:00
timothyteakettle
90eef6efc9 Merge remote-tracking branch 'upstream/master' into limbs 2020-09-03 22:46:32 +01:00
timothyteakettle
9e2ee588c9 rp prosthetics 2020-09-03 22:05:21 +01:00
Artur
c79e9fbc0b https://github.com/tgstation/tgstation/pull/53263 2020-09-02 18:48:09 +03:00