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

19101 Commits

Author SHA1 Message Date
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
keronshb
a192757843 BUG FIX: Changeling Bone Gauntlets work again (#14862) 
* Fixes Bone Gauntlets

* Better fix

* return
 2021-06-18 19:22:48 +02: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
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
silicons
49efd115ee Merge pull request #14832 from zeroisthebiggay/miscsprites 
TG Resprite Compendium Atomization Project | Episode Seven: Misc. Resprites & Distinctive Combat Defibs
 2021-06-13 15:24:30 -07:00
silicons
a91d5111c4 Merge pull request #14837 from zeroisthebiggay/trojancoyoteskirt 
(held against my will) adds a onesleeved croptop
 2021-06-13 15:19:37 -07:00
zerothebigboy
bae89fcaba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites 2021-06-13 18:19:01 -04:00
silicons
d6aaf5c96a Merge pull request #14824 from timothyteakettle/bee 
bees can go in containers and are released upon opening the container
 2021-06-13 15:18:46 -07:00
silicons
d0fc422b3a Merge pull request #14816 from SandPoot/tablet-pen-slot 
Adds a pen slot for tablet computers
 2021-06-13 15:16:37 -07:00
zerothebigboy
319e03476b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into miscsprites 2021-06-13 18:16:08 -04:00
silicons
f56e95e4e7 Merge pull request #14841 from MrJWhit/revert-14762-patch-2 
Revert "adds cat meteors"
 2021-06-13 15:15:59 -07:00
silicons
2dd0d014b9 Merge pull request #14813 from SandPoot/small-issues 
Fixes some small issues with cosmetic syndicate clothing (loadout clothing)
 2021-06-13 15:15:32 -07:00
silicons
431acd9d5c Merge pull request #14820 from qweq12yt/more-cargo-stuff 
[FIX] Some cargo related fixes
 2021-06-13 15:15:20 -07:00
MrJWhit
a324701730 Revert "adds cat meteors" 2021-06-13 05:25:02 -04:00
zerothebigboy
a395fc1b52 a 2021-06-12 19:58:53 -04:00
zerothebigboy
e757f9ea2c thetwentythirdofmany 2021-06-12 17:41:09 -04:00
silicons
2c61a48860 Update mark_datum.dm 2021-06-12 05:09:13 -07:00
zerothebigboy
3fae79f876 thetwentyfirstofmany 2021-06-11 20:28:25 -04:00
zerothebigboy
b7eecc315f theeighteenthofmany 2021-06-11 19:49:43 -04:00
zerothebigboy
53e95b7356 theseventeenthofmany 2021-06-11 19:48:04 -04:00
silicons
b188a6ea0f why 2021-06-11 16:15:31 -07:00
Timothy Teakettle
baad78e7fe bee 2021-06-11 16:08:55 +01:00
silicons
816b09bf32 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-10 22:36:26 -07:00
qweq12yt
584dce4a80 updating comments 2021-06-11 01:34:19 -03:00
BlackMajor
86881dc1af Merge pull request #14768 from Citadel-Station-13/silicons-patch-33 
makes xenos immune to stamina damage, with something that might be potentially horrifically abusable but isn't really fixable in a clean way yet
 2021-06-11 12:52:12 +12:00
qweq12yt
0ca61af62a fixed combo lockers 2021-06-10 16:50:44 -03:00
SandPoot
79c501a7b4 upload files 2021-06-09 21:36:43 -03:00
silicons
5e4f3ed694 Merge pull request #14683 from keronshb/shovedisarmgun 
Off Balance Disarms only if shoved into a wall or person.
 2021-06-09 12:14:37 -07:00
SandPoot
d70a35a48d upload syndicate.dm 2021-06-09 15:49:57 -03:00
silicons
09d61c3bec Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon 
New Challenger: The Cat Surgeon has appeared! (Ready!)
 2021-06-09 11:29:24 -07:00
silicons
a77aa8bd41 Merge pull request #14766 from Linzolle/cultfix 
Fix cult area shenanigans, cult can do stuff in maint again.
 2021-06-09 11:22:26 -07:00
silicons
224efa0e26 Merge pull request #14762 from DrPainis/patch-2 
adds cat meteors
 2021-06-09 11:21:55 -07:00
silicons
eb4b4088f4 Merge pull request #14760 from keronshb/floorcluwneport 
Ports Floor Cluwnes and Cluwnes.
 2021-06-09 11:21:22 -07:00
silicons
996a99b7f4 Merge pull request #14759 from Arturlang/uplink_misc_item_rebalances 
Changes the cost of the holoparasite injector and the ricochet eyepatch
 2021-06-09 11:21:12 -07:00
silicons
a56ac3ce07 Merge pull request #14749 from DrPainis/patch-14 
adds goliath calamari (currently untested because Forget™)
 2021-06-09 11:20:49 -07:00
silicons
30e7939e0e Merge pull request #14771 from keronshb/disposalcargo 
Lets the Cargo Shuttle use Disposal Pipes again
 2021-06-09 11:19:40 -07:00
silicons
dcd80edf5f Merge pull request #14806 from zeroisthebiggay/patch-11 
cuts the amount of essence revenant objective needs in half so it is actually feasibly possible
 2021-06-09 11:17:52 -07:00
silicons
7af470efef Merge pull request #14808 from SandPoot/fixes-soulstones 
Fixes soulstones runtiming
 2021-06-09 11:17:25 -07:00
silicons
c7df74f452 Merge pull request #14810 from zeroisthebiggay/patch-12 
Clowncar exploit fix
 2021-06-09 11:17:17 -07:00
silicons
ec63a4c62b Merge pull request #14779 from Arturlang/Orbit_menu_antags 
Makes orbit menu show antags if DNR
 2021-06-09 11:17:14 -07:00
silicons
3d86ce9bda Merge pull request #14787 from WanderingFox95/WanderingFox95-ORV-Revamp 
ORV Uniform Revamp
 2021-06-09 11:17:06 -07:00
silicons
2402c56bfc Merge pull request #14805 from bunny232/hydroslimejelly 
Hydroponics slimejelly recipe from tg
 2021-06-09 11:15:36 -07:00
silicons
c0e3b8d5ef Merge pull request #14809 from SandPoot/speak-nice-yes 
Centralizes borg speech and uses some of the icons for the typing indicator
 2021-06-09 11:15:01 -07:00