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

43495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
WanderingFox95 e709d5cf0c More code. Shouldn't break anything. 
We'll see if it does.
 2021-06-22 13:35:37 +02:00
WanderingFox95 f849af5d44 Adds plushies from various sources/custom made. 
A patch you didn't know you needed.
 2021-06-22 13:34:17 +02:00
Changelogs ba9f2b7c48 Automatic changelog compile [ci skip] 2021-06-22 00:22:24 +00:00
CitadelStationBot 51f680bbed Automatic changelog generation for PR #14870 [ci skip] 2021-06-21 12:12:54 -05:00
Lin be3260f7a6 Merge pull request #14870 from bunny232/metaxenodoor 
Metastation xenobiology pen door
 2021-06-21 10:12:51 -07:00
CitadelStationBot 38c7120502 Automatic changelog generation for PR #14850 [ci skip] 2021-06-21 10:54:58 -05: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
Changelogs 19e44efef1 Automatic changelog compile [ci skip] 2021-06-21 00:24:03 +00:00
CitadelStationBot bd1344b4b2 Automatic changelog generation for PR #14872 [ci skip] 2021-06-20 18:26:23 -05: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
CitadelStationBot 8a81fa7d79 Automatic changelog generation for PR #14873 [ci skip] 2021-06-20 18:25:25 -05: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
Changelogs 0a1f0d3e66 Automatic changelog compile [ci skip] 2021-06-20 00:24:26 +00:00
Timothy Teakettle 0113412190 Update vorepanel.dm 2021-06-19 16:28:52 +01:00
CitadelStationBot ab9a776690 Automatic changelog generation for PR #14863 [ci skip] 2021-06-19 09:04:51 -05:00
silicons 0cfe2ec4ca Merge pull request #14863 from miniusAreas/fdmm-patch-28485128-miniusAreas 
Various Fixes (freelance)
 2021-06-19 07:04:48 -07: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
CitadelStationBot 0067cc2b6e Automatic changelog generation for PR #14734 [ci skip] 2021-06-18 22:03:46 -05:00
silicons 3c7786dafd Merge pull request #14734 from keronshb/SpaceDragon 
(READY) Ports Space Dragon Midround Event.
 2021-06-18 20:03:43 -07:00
CitadelStationBot de26ea4a20 Automatic changelog generation for PR #14867 [ci skip] 2021-06-18 22:02:25 -05: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
CitadelStationBot 2fa8136e6a Automatic changelog generation for PR #14860 [ci skip] 2021-06-18 22:01:08 -05: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
CitadelStationBot 0e7760fb09 Automatic changelog generation for PR #14831 [ci skip] 2021-06-18 21:58:29 -05: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
CitadelStationBot ec2548949b Automatic changelog generation for PR #14864 [ci skip] 2021-06-18 21:58:09 -05:00
silicons 30d5a72688 Merge pull request #14864 from EmeraldSundisk/moresnax 
Smaller but more important changes to Snaxi.
 2021-06-18 19:58:06 -07:00
CitadelStationBot 5d3384d649 Automatic changelog generation for PR #14847 [ci skip] 2021-06-18 20:52:39 -05: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
Changelogs 1400c8deb9 Automatic changelog compile [ci skip] 2021-06-19 00:23:19 +00: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
CitadelStationBot eab6579cce Automatic changelog generation for PR #14862 [ci skip] 2021-06-18 12:22:50 -05: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 e7f4213082 Update MetaStation.dmm 2021-06-18 05:29:17 -04: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
Changelogs 2b89214d14 Automatic changelog compile [ci skip] 2021-06-18 00:22:21 +00:00
123 20bc2f2f59 Update scooter.dm 2021-06-17 16:16:21 -07:00
Changelogs 04debb2c20 Automatic changelog compile [ci skip] 2021-06-17 16:14:30 -07:00
silicons a8b7c07f00 Update open.dm 2021-06-17 07:07:49 -07:00
EmeraldSundisk d823c5b168 Update Snaxi.dmm 2021-06-16 21:58:32 -07:00
EmeraldSundisk 507b1f43c0 Merge pull request #82 from EmeraldSundisk/Citadel-Station-13-master 
Citadel station 13 master
 2021-06-16 21:17:32 -07:00
EmeraldSundisk 21845e0618 Merge pull request #81 from Citadel-Station-13/master 
6/16
 2021-06-16 21:16:14 -07:00
miniusAreas cf0d7f704a AAAAAAAAAAA 2021-06-16 22:20:52 -04:00
miniusAreas 04b67e3584 metapubbydelta 2021-06-16 22:14:57 -04:00
silicons 687d0adf23 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-16 19:04:07 -07:00