cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 23:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,593 Commits 12 Branches 0 Tags
f99fb1d4b8d73b7bc702be1f818cabdd8e4fc3bb
Commit Graph

75 Commits

Author SHA1 Message Date
MrSky12
f99fb1d4b8 GATO Vending Machine fix!! 2022-08-17 15:06:50 +02:00
MrSky12
2852a4ebac A bigger update for everything!! 
Added:
emoji
new ruins
a new vending machine??!
resprites for the welcome to kinaris lore is WIP rn.
etc.
 2022-04-20 00:28:50 +02:00
SomeGuyEatingPie
ab52d16f29 Copied changes to easily merge 2022-02-15 17:38:47 +00:00
ArchieBeepBoop
d5a37c18a3 Merge pull request #11 from Moltovz/posshim 
Adds Posshim's Corpus clothing. Ready To Merge
 2021-08-25 19:58:03 -03:00
Moltov
49f862a847 Adds Posshim's Corpus clothing. 
DNM
 2021-08-24 17:48:50 -04:00
Yipper Yapper
ad78cbbeea Added borb seed 2021-08-07 00:17:20 -07:00
AuStation Bot
4e6997922e Adds Unum deck 2021-06-18 14:06:11 -03:00
Kabra_men
6ea19bb7d2 Engislut 2021-06-02 18:20:06 -03:00
Dahlular
550f709ad9 Revert "Ports Vending Machine Tipping" 2021-06-01 04:07:43 -06:00
Dahlular
3218c844bb Revert "Something about taming vending machines" 2021-06-01 04:06:42 -06:00
Archie
725f8f96de And this. 2021-05-31 13:37:50 -03:00
Archie
c31112cc72 Also that. 2021-05-31 13:24:52 -03:00
Archie
2ad966435a Something about taming vending machines 2021-05-31 13:15:35 -03:00
Archie
b9dabca716 Ports Vending Machine Tipping 2021-05-15 17:21:29 -03:00
SaintHusky
ed5f2ba714 Slutty Nurse outfit 2021-05-12 19:53:05 +02:00
Dahlular
bee97fa7b4 Adds 4 different flannel types 2021-05-08 02:20:31 -06:00
Dahlular
978748b8d8 Merge pull request #1066 from lyricalpaws/master 
We're off to see the wizard
 2021-04-17 21:09:27 -06:00
QuoteFox
276a81f026 fluffy half-crop jacket. 2021-04-17 21:21:21 +01:00
Chloe Carver-Brown
f6683fbcd3 we're off to see the wizard 2021-04-15 15:12:13 +01:00
Marvin Megavolt
ac7a714604 Back for round 2 2021-03-31 21:53:46 -05:00
QuoteFox
a4826e6eab Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit f5cf7f6f5a, reversing
changes made to a32444dae7.
 2021-03-27 10:56:34 +00:00
CapnMachaddish
06a38d57a2 Now available from your local interdimensional dragon shopkeeper 2021-03-23 14:25:11 -05:00
lukevale
cf48916d8d final touches on the sweater. 2021-03-20 16:28:38 -05:00
DragonTrance
3ebb7488de Merge branch 'master' into plant-adding 2021-02-21 12:06:48 -07:00
DragonTrance
c729c61765 added tons of botany changes from citadel (not instability) 2021-02-21 09:57:29 -07:00
DragonTrance
24cb27b67c #5 2021-02-21 08:37:10 -07:00
Vladin
1bfe8bb816 love in the air 
no not really thats actually nerve gas
 2021-02-13 21:51:56 -05:00
QuoteFox
b39881f441 vending fix, wallet fix 
vending fix, wallet fix
 2021-02-04 23:40:40 +00:00
QuoteFox
a40e002595 loose ends. 
more prices I missed
 2021-02-04 14:20:17 +00:00
QuoteFox
2253473cc5 we dont use this anymore 
we dont use this anymore
 2021-02-04 12:47:09 +00:00
QuoteFox
5584bb9522 Economy part 2 - Vendors 2021-02-04 12:42:50 +00:00
CygnusB
00abae18ae one more time 
ye
 2021-01-19 18:54:17 -03:00
Vladin
a7ee5f4ce0 requiem 
uniform no longer awkwardly caps and shit added to vendor
 2021-01-03 20:10:09 -05:00
Poss
9d7e2c785e Update cigarette.dm 2020-11-21 22:47:09 -05:00
Oposshim
bb1694f301 Kinaris Corp 1.1.2 
another long overdue haul of shit I forgot/was to busy to get the first patch around.
 2020-11-21 12:05:56 -05:00
Ghom
28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -03:00
Dahlular
ee0017721e Merge pull request #627 from ArchieBeepBoop/spooky 
The Spookening: Ports Jacqueline the Pumpqueen event + Dullahan and subsequent Fixes
 2020-10-29 22:51:07 -06:00
kevinz000
fa655a1b78 Merge pull request #9456 from Thalpy/Spookytime 
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
 2020-10-28 16:04:47 -03:00
kevinz000
071f1cc6af Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art 
Code stuffs + more framework for cargo rework cuz atomic prs are good
 2020-10-28 04:52:13 -03:00
ToonClyde
4207015199 CitRP Fluffy Jackets 2020-10-26 14:30:59 -07:00
Vladin
5504a9e9da I was going to be a nurse but I don't like asking permission 
saved 2 people ran over 40 lets fucking gooooooooo
 2020-10-16 15:52:43 -04:00
ToonClyde
19de1094e0 tasty carbon nanotube noodles 2020-10-10 18:07:51 -07:00
SmeagleDeagle
23c7caf6d3 a 2020-09-18 02:40:43 -07:00
Vladin
461b914caf newlines back 
whoops didnt want to remove potentially important empty spaces
 2020-09-13 02:41:30 -04:00
Vladin
c944d0681b Galaxy Suits 
Adds the De Void of Soul and the Pulsar Gonne
Adds both to the loadout for 3 points each
Adds three Pulsar Gonnes to the clothesmate as contraband
Adds three De Void of Souls to the clothesmate as premium items
 2020-09-13 02:10:50 -04:00
Unknown
91490e10e2 secbed is now deployed from grenade 
because pulling a bed out of a vending machine was ridiculous
 2020-09-09 13:36:01 -05:00
Unknown
4e272b9cf4 blue yeen's request 
pink sec winter coat, BDSM whip + riding crop now inflict arousal damage on all intents + have special interaction if you target the groin (ass), slutbelt now can carry flashbangs/grenades + classic batons
 2020-09-05 17:13:33 -05:00
Unknown
4330bc4b13 security pet bed 2020-09-05 00:37:45 -05:00
Unknown
79a1167f2d security pet bed 
fucking merge conflicts make me want to detonate
 2020-09-05 00:20:31 -05:00
Unknown
55230cb73d Merge remote-tracking branch 'origin/slaveImplant' into slaveImplant 2020-09-05 00:12:08 -05:00