shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,499 Commits 5 Branches 0 Tags
269c845f4241079212cd58f919435345a6428903
Commit Graph

28364 Commits

Author SHA1 Message Date
Lin
269c845f42 Merge pull request #14877 from Putnam3145/optimize-processing 
inelastic exports no longer uselessly multiply their price by e^0 every tick
 2021-06-22 11:49:39 -07:00
Lin
0a25792663 Merge pull request #14880 from DeltaFire15/14860-fixes 
Fixes a bunch of things and some related should not sleeps because they make the CI cry
 2021-06-22 11:49:13 -07:00
DeltaFire
d0fc25bb0e empty lastline 2021-06-21 19:11:49 +02:00
DeltaFire
c7a098da06 suffering (aka, a bunch of fixes) 2021-06-21 19:05:31 +02:00
silicons
98ff06fa1a the roasted roasted roasted roasted roasted roasted roasted roasted......... (#14850) 
* Update misc.dm

* Update code/game/objects/items/melee/misc.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* Update misc.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-06-21 17:54:56 +02:00
Putnam3145
4ff019f56e Inelastic exports shouldn't process 2021-06-21 07:47:13 -07:00
Lin
3a914072b5 Merge pull request #14872 from Citadel-Station-13/silicons-patch-40 
it turns out i accidentally buffed glowshrooms by a factor of 21. this should probably be fixed.
 2021-06-20 16:26:21 -07:00
Lin
9117cc6a5c Merge pull request #14873 from timothyteakettle/vore 
vore href exploit fix
 2021-06-20 16:25:23 -07:00
silicons
29604b939c Update glowshroom.dm 2021-06-20 13:18:54 -07:00
Timothy Teakettle
0113412190 Update vorepanel.dm 2021-06-19 16:28:52 +01:00
silicons
8f3c1fe03a Update glowshroom.dm 2021-06-19 07:02:51 -07:00
silicons
c0e3af55bc Update glowshroom.dm 2021-06-19 06:59:26 -07:00
silicons
3c7786dafd Merge pull request #14734 from keronshb/SpaceDragon 
(READY) Ports Space Dragon Midround Event.
 2021-06-18 20:03:43 -07:00
silicons
fd0afa209f Merge pull request #14867 from kiwedespars/wheelyheely 
wheely heelies finally have that downside people have been telling me about
 2021-06-18 20:02:23 -07:00
silicons
ae6a648c4b Merge pull request #14869 from bunny232/21/79-the-finale 
21/79 the finale now with less map merge issues woops
 2021-06-18 20:02:07 -07:00
silicons
4768b23398 Merge pull request #14860 from Arturlang/nanite_updates 
Updates our nanite stuff to TG's, mostly
 2021-06-18 20:01:05 -07:00
silicons
bc4773b728 Merge pull request #14831 from zeroisthebiggay/beltsprites 
TG Resprite Compendium Atomization Project | Episode Six: Beltslot Sprites & Telebaton Resprite
 2021-06-18 19:58:27 -07:00
Putnam3145
f6b3bce2f3 Merge pull request #14847 from bunny232/21/79-the-revengence 
21/79 not 20/80 the revenge
 2021-06-18 18:52:37 -07:00
Putnam3145
84068b467a Merge pull request #14658 from silicons/backend_sync 
Updates tgui and build backend, fixes the build.bat for those with latest eslint (?)
 2021-06-18 17:23:35 -07:00
Lin
adc6b7d76a Merge pull request #14865 from Citadel-Station-13/silicons-patch-39 
when sprint is disabled, people jogging can still slip :)
 2021-06-18 13:53:23 -07:00
keronshb
a192757843 BUG FIX: Changeling Bone Gauntlets work again (#14862) 
* Fixes Bone Gauntlets

* Better fix

* return
 2021-06-18 19:22:48 +02:00
bunny232
fb9cc6fe45 Update atmospherics.dm 2021-06-18 05:25:02 -04:00
Putnam3145
5d574acdc2 Merge pull request #14794 from Citadel-Station-13/silicons-patch-35 
updates GLOB.flags to the new byond limit of 24 flags in one variable, up from 16.
 2021-06-18 00:47:07 -07:00
123
20bc2f2f59 Update scooter.dm 2021-06-17 16:16:21 -07:00
silicons
a8b7c07f00 Update open.dm 2021-06-17 07:07:49 -07:00
silicons
687d0adf23 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-16 19:04:07 -07:00
Lin
1e66357706 Merge pull request #14851 from Vynzill/spritinghell 
Extended Armwraps
 2021-06-16 11:30:01 -07:00
Timothy Teakettle
e12380cc40 Update embedded.dm (#14854) 2021-06-16 19:27:19 +02:00
Artur
5619b73e6b Makes it actually, actually work 2021-06-16 02:02:28 +03:00
Artur
ad0c3d477e Makes it work proper, hopefully 2021-06-16 01:48:54 +03:00
Artur
795ab3f835 https://github.com/tgstation/tgstation/pull/49798 2021-06-16 01:32:24 +03:00
Artur
096e7d4d67 https://github.com/tgstation/tgstation/pull/49927 2021-06-16 01:31:53 +03:00
Artur
fbcd1a3026 https://github.com/tgstation/tgstation/pull/55883 
With a minor tweak so humans don't benefit
 2021-06-16 01:26:02 +03:00
Artur
ab82766757 https://github.com/tgstation/tgstation/pull/59169 2021-06-16 01:19:48 +03:00
Artur
f33343c6db https://github.com/tgstation/tgstation/pull/56739 2021-06-16 01:17:13 +03:00
Artur
74c186d871 https://github.com/tgstation/tgstation/pull/56516 2021-06-16 01:16:39 +03:00
Artur
a430dc4d4d https://github.com/tgstation/tgstation/pull/56542 2021-06-16 01:16:08 +03:00
Artur
f3e16b298b https://github.com/tgstation/tgstation/pull/56588 2021-06-16 01:15:21 +03:00
Artur
b0d7482f04 https://github.com/tgstation/tgstation/pull/55902 2021-06-16 01:09:30 +03:00
Artur
e2eb9d52d0 https://github.com/tgstation/tgstation/pull/55164 2021-06-16 01:03:51 +03:00
Artur
18aee24231 https://github.com/tgstation/tgstation/pull/54902 2021-06-16 01:01:41 +03:00
Artur
337998e99a https://github.com/tgstation/tgstation/pull/54793 2021-06-16 00:46:05 +03:00
Artur
724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03:00
Lin
70de0547ab Merge pull request #14713 from silicons/json_interface 
adds json topic api for manifest, players, revision, and status.
 2021-06-14 20:17:05 -07:00
Lin
4ae09baa63 Merge pull request #14834 from silicons/on_found 
Fixes on_found triggering on storage
 2021-06-14 20:15:42 -07:00
Lin
84a6467fc9 Merge pull request #14835 from Citadel-Station-13/silicons-patch-37 
Mark datum is now a global verb
 2021-06-14 20:14:05 -07:00
Vynzill
df72710cae herewego 2021-06-14 17:19:05 -05:00
bunny232
03b921a121 Update tank.dm 2021-06-14 06:12:04 -04:00
silicons
6495bbcc81 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-13 16:13:30 -07:00
zerothebigboy
a64d94a7cc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites 2021-06-13 18:25:35 -04:00