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
Dahlular
8f0eabe199
Merge pull request #356 from jjpark-kb/trashpiles
...
Trashpiles
2020-08-01 04:29:45 -06: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
Dahlular
7d2c3e8581
Merge pull request #354 from quotefox/lagimprovements
...
Lag cleaning.
2020-07-30 11:55:55 -06:00
Dahlular
5b933cb277
Merge pull request #352 from Oposshim/Poss-Fix-v1
...
poss tweak
2020-07-30 08:23:23 -06:00
Dahlular
1e833ff6ff
Merge pull request #351 from jjpark-kb/posialertsystem
...
adds the positronic alert system
2020-07-30 08:15:51 -06:00
QuoteFox
b1d82e4ff5
Lag cleaning.
...
Ports and Improvements to help attack lag.
2020-07-29 23:54:40 +01:00
jjpark-kb
29f32eedd6
changes the cyan to purple for research doors
2020-07-28 19:37:40 -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
jjpark-kb
08ba88559f
adds the positronic alert system
2020-07-28 18:42:23 -04:00
Chemlight
e7adf4df86
Brushed off salt
...
Changed 20 seconds to 15.
2020-07-27 18:53:46 -07:00
Chemlight
f1d59db927
Sonic Jack Hammer Nerf
...
This change is to modify the sonic jackhammer intereacting with reinforced walls from a previous 5 seconds to a now total of 20 seconds
2020-07-27 13:36:48 -07: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
5a6a1ecd46
Merge pull request #333 from Jay-Sparrow/cloning
...
Cloning fix
2020-07-17 19:39:51 -06:00
Jay-Sparrow
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
Dahlular
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
Dahlular
281082329f
Merge pull request #330 from jjpark-kb/okaysothereareproblems
...
small amount of fixes
2020-07-17 18:04:55 -06:00
Dahlular
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
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
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
Dahlular
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
Dahlular
18588e6f99
funny synth port part 1 which may or may not have broken a lot
2020-07-07 23:58:21 -05:00