Commit Graph

118 Commits

Author SHA1 Message Date
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
QuoteFox a96b5eae50 Update
Fixes to boxstation doors, lavaland doors, RCD now allows users to rotate doors, Voice_of_god.dm var changes to stop confliction with next update. New wooden floor texture, New walls.
2020-04-05 22:20:00 +01:00
Improvedname e066eb133f effort. 2020-03-23 21:42:28 +01:00
Improvedname 78786b28da ff 2020-03-22 19:17:51 +01:00
QuoteFox 1bbb7d1a94 Merge pull request #239 from improvedname/mad
Fixes cardboard bug allowing you to move lightning speed when moving into a wall
2020-03-21 22:55:13 +00:00
Improvedname 43a717d950 Update cardboardbox.dm 2020-03-21 23:25:46 +01:00
Improvedname f376b64f31 AAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-03-20 22:50:57 +01:00
Improvedname 83cee8d8f8 nani 2020-03-18 21:25:16 +01:00
QuoteFox b29a8c25f6 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2020-03-03 13:16:37 +00:00
QuoteFox cb561ff456 fix for plushie reward 2020-03-03 13:16:25 +00:00
Dahlular 0074c18915 Merge pull request #211 from zeskorion/master
keepin beeviro porting consistent for ya
2020-03-03 00:16:29 -07:00
jbox1 13863b3cd6 Update plushes.dm 2020-02-28 17:14:36 +11:00
zeskorion 358665713f teratoma drops 2020-02-19 11:26:22 -08:00
Dahlular 4cc3b6ebc5 Merge pull request #205 from ForrestWick/firemancarry
Fireman Carry
2020-02-13 18:18:14 -07:00
ForrestWick 41870bbf24 Fireman Carry 2020-02-13 18:26:40 -06:00
Dahlular 70e6444d47 Merge pull request #193 from Azarak/hardhats2
Adds welding hardhats, no conflicts this time
2020-02-07 23:33:00 -07:00
Azarak d5593ef017 Holofans, forcefield gens, temperature block 2020-02-03 21:58:35 +01:00