shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,872 Commits 5 Branches 0 Tags
58df45ee3facf2b637f21705d5c69cfeb7bae940
Commit Graph

42872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
silicons 58df45ee3f Merge pull request #14727 from zeroisthebiggay/patch-10 
more drink mixture flavortext
 2021-05-18 16:44:35 -06:00
CitadelStationBot 66a7201539 Automatic changelog generation for PR #14726 [ci skip] 2021-05-18 17:44:27 -05:00
silicons 80bb2b235b Merge pull request #14726 from zeroisthebiggay/carshalash 
ports Amaretto from TG
 2021-05-18 16:44:24 -06:00
Changelogs 79051c3e8e Automatic changelog compile [ci skip] 2021-05-18 00:30:35 +00:00
Lin a9cf6a1818 Merge pull request #14724 from bunny232/master 
(not urgent) Deletes a extra nav beacon I left in while fixing the meta bots
 2021-05-16 14:05:43 -05:00
Changelogs 340571832b Automatic changelog compile [ci skip] 2021-05-16 00:30:09 +00:00
zeroisthebiggay a0b83950ae Update drinks_recipes.dm 2021-05-15 12:03:04 -04:00
zeroisthebiggay 03c2f752fa Update drinks_recipes.dm 2021-05-15 11:51:43 -04:00
zeroisthebiggay 2bc5edede0 Update drinks_recipes.dm 2021-05-15 09:51:48 -04:00
zeroisthebiggay 8166167a45 Update drinks_recipes.dm 2021-05-15 09:44:21 -04:00
zeroisthebiggay 1ff27aa732 Update drinks_recipes.dm 2021-05-15 09:43:55 -04:00
zeroisthebiggay 90f9c3cb79 Update drinks_recipes.dm 2021-05-15 09:39:56 -04:00
zerothebigboy 37873d6750 gommit 2021-05-15 08:52:24 -04:00
bunny232 a2cd960e20 Update MetaStation.dmm 2021-05-15 00:34:54 -04:00
bunny232 90f32f0a16 Merge pull request #4 from Citadel-Station-13/master 
Meta station bot stuck pr trash cleanup
 2021-05-15 00:24:40 -04:00
Changelogs 3d1bbd6229 Automatic changelog compile [ci skip] 2021-05-15 00:27:18 +00:00
CitadelStationBot e01908742a Automatic changelog generation for PR #14721 [ci skip] 2021-05-14 17:31:51 -05:00
silicons e7d584857b Merge pull request #14721 from bunny232/Meta-bot-fix 
Meta bots don't get stuck at engi anymore
 2021-05-14 16:31:49 -06:00
bunny232 97685de715 Update MetaStation.dmm 2021-05-14 14:54:37 -04:00
bunny232 7aa4ba0fec Merge pull request #3 from Citadel-Station-13/master 
updoot
 2021-05-14 14:49:29 -04:00
silicons 4ffec1dafa Update gateway.dm (#14711) 2021-05-14 17:50:27 +02:00
CitadelStationBot a3c9892081 Automatic changelog generation for PR #14627 [ci skip] 2021-05-14 10:47:42 -05:00
Timothy Teakettle 739b7cea26 borg spraycans have a five second delay before being able to knock someone down again (#14627) 
* Update crayons.dm

* Update crayons.dm

* kevin review changes

* Update crayons.dm

* Update code/game/objects/items/crayons.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-05-14 17:47:40 +02:00
Changelogs 4a5561d273 Automatic changelog compile [ci skip] 2021-05-14 00:31:50 +00:00
CitadelStationBot 04b1064cbf Automatic changelog generation for PR #14715 [ci skip] 2021-05-13 17:50:19 -05:00
Lin d7f8136d5a Merge pull request #14715 from keronshb/vogsleepgone 
Removes Voice of God sleep again since an undocumented change readded it.
 2021-05-13 17:50:14 -05:00
CitadelStationBot 6faeca58d2 Automatic changelog generation for PR #14718 [ci skip] 2021-05-13 04:03:44 -05:00
silicons 454693e0ae Merge pull request #14718 from zeroisthebiggay/patch-9 
consealed
 2021-05-13 03:03:41 -06:00
zeroisthebiggay 040bcb155a Update uplink_stealth.dm 2021-05-13 05:03:09 -04:00
Changelogs 82d11bce81 Automatic changelog compile [ci skip] 2021-05-13 00:28:55 +00:00
keronshb 6e3e075ff9 Oops forgot something 2021-05-12 13:14:54 -04:00
keronshb fa067a481a Removes VOG sleep command again 
Undocumented change.
 2021-05-12 13:09:39 -04:00
CitadelStationBot 70a48a1318 Automatic changelog generation for PR #13392 [ci skip] 2021-05-12 05:44:55 -05: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
CitadelStationBot 5eb1f38f5e Automatic changelog generation for PR #14650 [ci skip] 2021-05-12 05:43:13 -05:00
silicons 625488891e Merge pull request #14650 from WanderingFox95/WanderingFox95-LavalandWine 
Lavaland Wine: Pinot Mort (Ready)
 2021-05-12 04:43:11 -06:00
CitadelStationBot 2b8fd131e0 Automatic changelog generation for PR #14710 [ci skip] 2021-05-12 05:42:30 -05:00
silicons 2d455e4da2 Merge pull request #14710 from Linzolle/anthro 
Anthromorphic isnt a word
 2021-05-12 04:42:28 -06:00
CitadelStationBot 72667c6485 Automatic changelog generation for PR #14708 [ci skip] 2021-05-12 05:42:25 -05:00
silicons c5f13c44a8 Merge pull request #14708 from qweq12yt/misc-fixes 
[Fix] Bugs are BAD!
 2021-05-12 04:42:22 -06:00
CitadelStationBot f5c4d9adf2 Automatic changelog generation for PR #14702 [ci skip] 2021-05-12 05:42:14 -05:00
silicons 3b1d66efc5 Merge pull request #14702 from zeroisthebiggay/fineilldooitmyself 
bunny ears but they're not lops (vegas style)
 2021-05-12 04:42:12 -06:00
Changelogs e7107af0a4 Automatic changelog compile [ci skip] 2021-05-12 00:18:48 +00:00
keronshb 35476cb5ce Merge remote-tracking branch 'upstream/master' 2021-05-11 17:59:47 -04:00
Lin 82b6443928 Merge pull request #14700 from keronshb/skewerpain 
What if failing to remove a brass skewer caused *pain?
 2021-05-11 14:11:07 -05:00
CitadelStationBot 35fa7809a1 Automatic changelog generation for PR #14706 [ci skip] 2021-05-11 14:08:36 -05:00
Lin 0a883f3796 Merge pull request #14706 from DeltaFire15/heretic-bladeshatter-bug 
Fixes heretic bladeshatters, also fixes find_safe_turf since those were related
 2021-05-11 14:08:34 -05:00
Lin 923e4a2b91 Merge pull request #14707 from bunny232/Delta-viro-salt-pr 
Delta station Viro atmos 🧂  pr
 2021-05-11 14:07:14 -05:00
Changelogs 051f9d06fc Automatic changelog compile [ci skip] 2021-05-11 00:17:56 +00:00
Linzolle 4609d732f9 more spellcheck of anthropomorph 2021-05-10 17:15:43 -05:00