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 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,291 Commits 55 Branches 0 Tags
54641ce2015f632b07e09f065abc119f677b7fed
Commit Graph

2366 Commits

Author SHA1 Message Date
Putnam3145
79f9560135 maybe fixes minesweeper lag without weirdness 2021-08-17 20:47:13 -07:00
Artur
977d129de6 Shuttle lights are back on 2021-07-30 23:45:55 +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
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur
30016f38a8 compiles 2021-07-28 02:13:57 +03:00
Artur
9fcc762b7d pain 2021-07-28 02:13:57 +03:00
Artur
3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
Artur
cdbd585f4d update_appearance 2021-07-28 02:13:57 +03:00
silicons
3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -07:00
Lin
5f312363e3 Merge pull request #14909 from DeltaFire15/slimepuddle-why 
Changes turrets back to check for stamcrit instead of mobility_use
 2021-07-02 00:51:18 -07:00
silicons
8710731b87 tweaks 2021-07-01 20:42:55 -07:00
DeltaFire
3874d9d49d mobility moment 2021-07-01 02:24:37 +02:00
Putnam3145
f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07:00
Putnam3145
fbbae70527 i need to go to bed and this is a LOT 2021-06-21 10:14:50 -07:00
Putnam3145
c253a2de86 alright how about these 2021-06-21 09:52:54 -07:00
Putnam3145
c06983ce09 uh... does this? 2021-06-21 09:27:32 -07:00
Putnam3145
0bf383a90b does this fix it 2021-06-21 09:18:06 -07:00
Putnam3145
e65f13637d Made hotspots take generic fires into account 2021-06-20 18:09:11 -07:00
zerothebigboy
fb32aa1248 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	tgstation.dme
 2021-06-20 03:29:50 -04:00
Putnam3145
dbdc3001ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-16 23:33:14 -07:00
silicons
b77da2824a Merge pull request #14830 from zeroisthebiggay/dishdrive 
TG Resprite Compendium Atomization Project | Episode Five: Dish Drives
 2021-06-13 15:14:30 -07:00
zerothebigboy
4486b08bd4 thefifteenthofmany 2021-06-11 19:33:51 -04:00
Putnam
833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
zerothebigboy
39d951a4a8 thesixthofmany 2021-06-11 18:24:29 -04:00
Putnam
3b25f3e199 Started expanding auxgm a bit 2021-06-10 04:40:23 -07:00
zerothebigboy
1a90c96e4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/feet.dmi
#	icons/mob/clothing/feet_digi.dmi
#	icons/mob/clothing/head.dmi
#	icons/mob/clothing/mask.dmi
#	icons/mob/clothing/mask_muzzled.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/masks.dmi
#	icons/obj/items_and_weapons.dmi
 2021-06-09 17:40:28 -04:00
Putnam
86177c51c4 auxgm part 1 
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
 2021-06-08 09:54:28 -07:00
silicons
cb52be5dd9 fixes linter warnings (#14778) 
* woo

* woo
 2021-05-31 10:19:20 -05:00
zerothebigboy
bd186d25cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 2021-05-23 15:29:20 -04:00
Putnam
e580c504fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-05-21 18:52:16 -07:00
Lin
0c77834c56 Merge pull request #14733 from qweq12yt/misc-fixes 
[Fix] Even More bug fixing
 2021-05-19 14:49:00 -05:00
qweq12yt
ba20b5b8aa fix emag shuttle order 2021-05-17 18:48:01 -03:00
silicons
5601badbff deterministic explosion system (#13392) 
* wae explosions

* okay

* changes

* fixes

* fix

* ok

* ok

* kills more dead code

* okay

* fix

* ok

* tiles

* ok

* okay

* woops

* ok

* fix

* okay

* mob damage

* fixes

* insanity

* more

* more

* fixes

* more

* woot

* don't commit that

* YES

* fix
 2021-05-12 05:44:53 -05:00
LetterN
57044515d2 fixes-emag-on-console 2021-05-09 21:39:26 +08:00
zerothebigboy
359c778955 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	code/modules/ninja/suit/ninjaDrainAct.dm
 2021-05-02 22:47:39 -04:00
silicons
47489c21d6 Merge remote-tracking branch 'citadel/master' into auxtools-atmos 2021-04-27 00:59:45 -07:00
SandPoot
e6c23728eb upload files 2021-04-23 12:56:11 -03:00
silicons
b41790842b Merge pull request #14546 from Putnam3145/bluespace-pipe 
Ports bluespace pipes from yogs
 2021-04-18 18:53:14 -06:00
silicons
30fd90a87c Merge pull request #14606 from SandPoot/cloning-machine-tgui 
TGUIZES the cloning computer
 2021-04-17 17:00:49 -06:00
SandPoot
a745431155 better this 2021-04-13 17:26:46 -03:00
SandPoot
330a3b8c9a upload files 2021-04-13 17:25:08 -03:00
Blue Wildrose
8b47786556 Pirate stuff and comm console fixes 2021-04-13 00:53:55 -07:00
SandPoot
c15852f47b upload _machinery.dm 2021-04-06 19:27:52 -03:00
Putnam
68ad5c2e5c disposability 2021-03-30 23:56:12 -07:00
Putnam
6ae984971c Ported bluespace pipes from yogs 2021-03-30 23:25:36 -07:00
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
Lin
130a76677b Merge pull request #14527 from LetterN/yay-nullspace 
Fixes order-of-nullspacing boards
 2021-03-28 18:03:18 -05:00
silicons
4f3e695afa Merge pull request #14495 from Hatterhat/synth-aug 
is it really an augmentation if you're using a synthflesh-grown limb? no, probably not, but what if you could
 2021-03-27 01:35:54 -06:00