cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-10 07:37:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,230 Commits 12 Branches 0 Tags
44574a0663349e528d426e1cfa3e40d078e08bd2
Commit Graph

134 Commits

Author SHA1 Message Date
Crashtest-LXXXIX
44574a0663 Update cigs_lighters.dm 
added some new lines and changed carp cigarettes to 7.5 salt 7.5 nicotine to prevent possible potassium explosion reaction
 2020-08-22 02:20:18 +01:00
Crashtest-LXXXIX
a656d33246 Update cigs_lighters.dm 
added extra chemicals to  free cigarettes except for rollies and space cigarettes
 2020-08-21 22:58:59 +01:00
Unknown
3720725aff storge -> storage 2020-08-15 22:30:39 -05:00
Kabra_men
07533114c1 stuff 2020-08-07 03:32:42 -03:00
Dahlular
02fbed82a4 Merge pull request #375 from CydiaButt13/CydiaButt13 
Removes slurs from the code/Changes the meatball name
 2020-08-04 16:05:56 -06:00
Cydia
d8b3888b02 Removes slurs from the code/Changes the meatball name 
I feel like this was long overdue, especially for github TOS.
 2020-08-04 00:13:46 -05:00
QuoteFox
3212dff5e7 Merge pull request #340 from Strazyplus/DRAGONMECH 
DRAKEBORGS & PLUSHIES
 2020-08-03 22:56:28 +01:00
jjpark-kb
08cba9e799 adds a busy check 2020-07-31 20:31:06 -04:00
jjpark-kb
9c47b32571 adds hiding objects 2020-07-30 17:51:55 -04:00
jjpark-kb
73fbdecca1 adds trash piles to maint 2020-07-30 17:16:21 -04:00
Oposshim
23fca2d314 poss tweak 
a new character creation background (Hirophant tiles)/ I forgot the sec cap Ns/ the NT MREs in maints/ I decided that the medical + is fuck ugly/ sneaked a system shock 2 reference in the toys with the rest of the SS13 sci fi stuff/ more NT i forgot with cargo bounties/ basically more surface level fixes
 2020-07-28 19:24:45 -04:00
Navier
760c7c3b53 Merge branch 'master' into DRAGONMECH 2020-07-19 02:42:02 -04:00
Strazyplus
10d8b87431 the basics work, good enough.... lets get this out already fucckkkkk 
WEEKS OF PAIN
BE GENTLE
GORDON HELP!
 2020-07-18 17:44:19 -04:00
Dahlular
cf6fbfbd18 Merge pull request #332 from jjpark-kb/youneedradialsson 
porting some radials
 2020-07-17 18:22:34 -06:00
jjpark-kb
d1e22462ad lots of radial stuff 2020-07-17 17:58:30 -04:00
jjpark-kb
6ce26a163f okay, here are some changes 2020-07-16 22:27:26 -04:00
Dahlular
dfaf49573a Merge pull request #317 from Chemlight/Make-Virology-Great-Again 
Reverse Engineering Virology from Beeviro
 2020-07-14 17:04:38 -06:00
Chemlight
ee62657a24 Reverse Engineering Virology from Beeviro 
Attempted to fix virology as the current addition/changes were incomplete with the individual working on it just disappearing and just leaving it in it's current state, this change will revert back virology to the old system with the old symptoms and stats as it was before. (hopefully)
 2020-07-13 15:57:22 -07:00
Dahlular
18ba11ca9d Merge pull request #310 from Oposshim/goldenplaque 
kin.corp addons
 2020-07-13 00:23:43 -06:00
Dahlular
58a667e35f lorebook 1 2020-07-11 21:24:33 -06:00
Oposshim
2e0ce45a75 kin.corp addons 
dahl wanted the drop pod tweaked. I also threw in a bonus to cheer him up a lil'
 2020-07-10 19:40:21 -04:00
CygnusB
dac9ba1246 ports malric plushie 
hell yes
 2020-07-10 02:46:05 -03:00
Oposshim
82d190b276 another poss to kin lore pull 
nuff said
 2020-07-09 03:01:26 -04:00
Oposshim
6fa390975d Merge remote-tracking branch 'upstream/master' into call-it-whatever-the-fuck-i-want 2020-07-09 02:54:49 -04:00
Oposshim
0716161cd3 another poss 2 kinaris lore push 
golden plaque + Kin.Co UI revamp
 2020-07-09 02:42:40 -04:00
Oposshim
5c588998bc yet another poss to kinaris push 
a golden sign in Valarie's name
 2020-07-09 02:15:07 -04:00
Dahlular
d3a4402fb2 Merge branch 'master' into pubby 2020-07-08 07:01:36 -06:00
Dahlular
29774be859 Updates PubbyStation for Map Usage (And adds a neat Kinaris sign!) 2020-07-08 06:12:51 -06:00
QuoteFox
212456d64e Revert "Grab and Drag Animations" 
This reverts commit ad898efb9e.
 2020-07-04 08:41:11 +01:00
CygnusB
137ed7f372 Rings 
hell yeah rings
 2020-07-03 19:59:19 -03:00
QuoteFox
ad898efb9e Grab and Drag Animations 
Grab and Drag Animations, allowing players to see whos dragging who, via a pixel shift.
 2020-07-02 09:58:24 +01:00
QuoteFox
d80c21e25a Fix to Transit Tubes 
No longer have collisions.
 2020-06-25 04:56:15 +01:00
QuoteFox
4c1e05259d Merge pull request #277 from Oposshim/call-it-whatever-the-fuck-i-want 
Call it whatever the fuck i want
 2020-06-13 04:10:03 +01:00
Oposshim
fd45d84d84 another kinaris push + fix 
i cant mentally do this anymore, i checked the code myself it should work and fit
 2020-06-12 19:59:33 -04:00
Oposshim
cd7fa47670 barsign fix 
fucking, while splicing code there was a forward slash that rendered the code fucked and it took me 10 minutes just to find one single symbol that fucked the game compiling
 2020-06-12 13:42:07 -04:00
QuoteFox
b2b863b34c Merge pull request #273 from Oposshim/call-it-whatever-the-fuck-i-want 
Call it whatever the fuck i want
 2020-06-12 18:07:04 +01:00
Dahlular
29b0b841d9 Compiling Error 
duplicate definition
 2020-06-12 02:31:58 -06:00
Oposshim
1c6b863fc5 soap 
i forgot to fix the soap sprite and its kinaris descript
 2020-06-12 01:07:22 -04:00
Oposshim
0880ceb0c7 Kinaris.Co Revamp2 
more code changes to kin co instead of nanotrasen
 2020-06-11 14:17:33 -04:00
Dahlular
6f57fc2f63 Merge pull request #269 from SlimeRetard/master 
Port the mesmetron from aurorastation and put it in hacked kinkmate
 2020-06-10 20:00:09 -06:00
Oposshim
ec63e00e6c Merge branch 'call-it-whatever-the-fuck-i-want' of https://github.com/Oposshim/Hyper-Station-13 into call-it-whatever-the-fuck-i-want 2020-06-09 23:21:25 -04:00
Oposshim
9fadd24031 dahl deleted a file 
the replacement file
 2020-06-09 23:19:36 -04:00
Dahlular
cee70f0ae1 We're not changing this one quite yet 2020-06-09 20:56:58 -06:00
Dahlular
96c19c5382 Merge branch 'master' into call-it-whatever-the-fuck-i-want 2020-06-09 20:54:12 -06:00
Oposshim
b99ac77618 Kinaris.Co Revamp 
friendship ended with nanotrasen, now friends with Kinaris.co

https://cdn.discordapp.com/attachments/366046230830252033/720066721859502080/friendship-ended-with-mudasir-salman-is-m-best-friend-friendship-53353410.png
 2020-06-09 22:33:40 -04:00
SlimeRetard
131c3974d4 Add mesmetron 2020-06-08 01:03:07 +01:00
QuoteFox
780c4eaf5f You forgot a quotation 
owned lol
 2020-05-25 21:31:43 +01:00
Dahlular
5c7e7e1151 Merge pull request #250 from Oposshim/call-it-whatever-the-fuck-i-want 
Book sprite revamp
 2020-05-25 13:00:56 -06:00
Oposshim
e4ba630d6c So I finally tweaked the code for the datapads so >IF< someone actually inspects it, it wont just say book and break muh immersion 2020-04-21 21:22:27 -04:00
QuoteFox
7adeffa699 Fixes to walls and window smoothing 2020-04-07 16:45:19 +01:00