shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,762 Commits 5 Branches 0 Tags
4e9e98367ff72f3f46371688bdf337c7be72d708
Commit Graph

2232 Commits

Author SHA1 Message Date
zerothebigboy
c6ce359cda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	tgstation.dme
 2021-09-19 15:23:52 -04:00
silicons
c04f0cb953 Merge pull request #15154 from qweq12yt/test 
[Fix] Fixes Space Heater behavior
 2021-09-19 11:06:15 -07:00
qweq12yt
781a414c38 fix space heaters 2021-09-15 18:16:04 -03:00
Lin
d536d22100 Merge pull request #15109 from Citadel-Station-13/silicons-patch-11 
fixes airlocks not unshocking themselves
 2021-09-14 01:09:22 -05:00
Lin
4cdee473a4 Merge pull request #15132 from Citadel-Station-13/silicons-patch-17 
[03:37:30] Runtime in recycler.dm, line 185: Cannot execute null.forceMove().
 2021-09-14 01:08:15 -05:00
silicons
85659a297f Merge pull request #15071 from Putnam3145/remove-bomb-research-cap 
Remove arbitrary bomb research cap + tweak formula a little
 2021-09-13 15:09:28 -07:00
silicons
fcac5fa3c0 Update recycler.dm 2021-09-12 20:40:25 -07:00
zerothebigboy
68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
silicons
a8d9a38d18 Update airlock.dm 2021-09-09 17:58:47 -07:00
silicons
d72d05485a Update airlock.dm 2021-09-09 03:34:02 -07:00
Putnam3145
845786a81a Actually, 5000 is the new point 2021-09-02 21:10:11 -07:00
Putnam3145
007c5b02a4 Remove bomb research cap; tweak formula to suit 2021-09-02 21:01:12 -07:00
zerothebigboy
e53223a149 unversioned 2021-09-02 23:50:38 -04:00
Cognition
a03abc5658 forgot unscrew updating, adds appearance updating to stabilized yellow slime extract 2021-08-28 20:25:43 -07:00
Cognition
fc2e101402 Fixes updates for rechargers & energy guns, ports finish recharging msg 2021-08-28 19:24:29 -07:00
zerothebigboy
06181f51ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	code/modules/ninja/suit/suit.dm
 2021-08-19 21:55:22 -04:00
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