Commit Graph
266 Commits
Author SHA1 Message Date
NavierandGitHub 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
DahlularandGitHub 5a6a1ecd46 Merge pull request #333 from Jay-Sparrow/cloning
Cloning fix
2020-07-17 19:39:51 -06:00
Jay-SparrowandGitHub b6c4bc088b Merge branch 'master' into cloning 2020-07-17 19:42:19 -05:00
jjpark-kb bc43bb59cd Merge remote-tracking branch 'hyper/master' into xenoarchtime 2020-07-17 20:40:53 -04:00
DahlularandGitHub cf6fbfbd18 Merge pull request #332 from jjpark-kb/youneedradialsson
porting some radials
2020-07-17 18:22:34 -06:00
jjpark-kb 542ceb7996 Merge remote-tracking branch 'hyper/master' into xenoarchtime 2020-07-17 20:07:33 -04:00
DahlularandGitHub 281082329f Merge pull request #330 from jjpark-kb/okaysothereareproblems
small amount of fixes
2020-07-17 18:04:55 -06:00
DahlularandGitHub 23220db465 Merge pull request #324 from jjpark-kb/addvscodeplease
Adds VSCODE stuff
2020-07-17 17:18:43 -06:00
JaySparrow e5592937aa Cloning fix
Clone pod works more than once, and resizes characters
2020-07-17 17:14:01 -05:00
jjpark-kb d1e22462ad lots of radial stuff 2020-07-17 17:58:30 -04:00
JaySparrow 546f3a993c Revert "Revert "Do Not Clone""
This reverts commit 05acfc1f72.
2020-07-17 16:26:32 -05:00
jjpark-kb 24e989cb34 there, I got chasms to work now 2020-07-17 04:17:38 -04:00
jjpark-kb b94acd3962 xenoarch yes 2020-07-17 03:46:44 -04:00
JaySparrow 05acfc1f72 Revert "Do Not Clone"
This reverts commit 3c572f0d6e.
2020-07-17 00:22:23 -05:00
jjpark-kb 89409ee834 adding xenoarch 2020-07-16 23:33:06 -04:00
jjpark-kb 6ce26a163f okay, here are some changes 2020-07-16 22:27:26 -04:00
JaySparrow 36257c0d9a SIZE CODE
3 AM, WOOO. MAYBE IT WORKS NOW.
2020-07-16 03:05:10 -05:00
jjpark-kb 1d33f7f1fb ports the vscode stuff from tg 2020-07-15 22:15:51 -04:00
DahlularandGitHub 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
DahlularandGitHub 18ba11ca9d Merge pull request #310 from Oposshim/goldenplaque
kin.corp addons
2020-07-13 00:23:43 -06:00
DahlularandGitHub 6d3cac3ce5 Merge pull request #315 from Jay-Sparrow/Synthlegs
Synths
2020-07-13 00:14:18 -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
DahlularandGitHub f5fd66c41c Merge pull request #299 from Kabramen/Lavaland-ruins
Oasis ruins
2020-07-08 06:17:29 -06:00
Dahlular 29774be859 Updates PubbyStation for Map Usage (And adds a neat Kinaris sign!) 2020-07-08 06:12:51 -06:00
DahlularandJaySparrow 18588e6f99 funny synth port part 1 which may or may not have broken a lot 2020-07-07 23:58:21 -05:00
JaySparrow 3c572f0d6e Do Not Clone
Adds a new trait for people who don't want to be cloned. Gives the medical bay something to do at least.

Also, moves a define to it's appropriate folder to prevent any potential future problems because for some reason it does matter where those defines are for certain procs. The new trait is in negative.dm instead of the hyper traits file, because it populates the list in that order and not based on cost.
2020-07-07 19:49:04 -05:00
QuoteFox 62c3aa6b17 cringe
cringe
2020-07-05 21:19:26 +01:00
QuoteFox 89269608f0 fix to cloning
another fix...
2020-07-05 20:40:36 +01:00
QuoteFox fdb36f8399 Fix to cloning
Fix to cloning
2020-07-05 20:38:59 +01:00
QuoteFox 93461d7118 Body size cloner fix!
When cloning, they will now apply your body size. No more forced resize on cloning!
2020-07-05 13:37:14 +01:00
Kabra_men f01842fbca Oasis 2020-07-05 02:34:46 -03: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 49f8093b5b Reward for Patreons!
Introduces alittle heart into chat, for the supporters!
2020-07-02 20:54:22 +01: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
QuoteFoxandGitHub 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
QuoteFoxandGitHub 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
DahlularandGitHub 29b0b841d9 Compiling Error
duplicate definition
2020-06-12 02:31:58 -06:00