Commit Graph
58 Commits
Author SHA1 Message Date
DahlularandGitHub 12811fc930 Merge pull request #238 from jbox144/makes-the-cum
Ports previous changes of breasts to the penis
2020-03-22 20:30:46 -06:00
jbox1 ac36c36794 removes tania station and fixes some shit 2020-03-22 10:39:23 +11:00
jbox1 4e372e9dae makes the cum 2020-03-21 21:30:16 +11:00
Improvedname f376b64f31 AAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-03-20 22:50:57 +01:00
DahlularandGitHub 0074c18915 Merge pull request #211 from zeskorion/master
keepin beeviro porting consistent for ya
2020-03-03 00:16:29 -07:00
zeskorionandGitHub 8e28953bb5 balance changes 2020-02-27 12:43:53 -08:00
zeskorionandGitHub f194bd9cf4 balance changes 2020-02-27 11:56:20 -08:00
zeskorionandGitHub 78413f5f82 nerfs beneficial threshold 2020-02-27 11:37:54 -08:00
zeskorionandGitHub ef17fd5fee Update skin.dm 2020-02-27 11:33:43 -08:00
zeskorionandGitHub b89f4bf1f1 Add files via upload 2020-02-19 11:16:57 -08:00
zeskorionandGitHub 276de56753 before i even finish compile cuz im cool like that 2020-02-19 11:12:50 -08:00
zeskorionandGitHub d319715b88 new procs 2020-02-19 11:11:29 -08:00
DahlularandGitHub 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
DahlularandGitHub 70e6444d47 Merge pull request #193 from Azarak/hardhats2
Adds welding hardhats, no conflicts this time
2020-02-07 23:33:00 -07:00
quotefox a185cd7fd8 radiation storms no longer effect dorms, so RP'ers don't have to run into maint. 2020-02-05 11:46:49 +00:00
Azarak 4c06f50180 Welding hardhats 2020-02-03 21:35:06 +01:00
quotefoxandGitHub 037397eec1 Revert "[Ready] Adds "Empty" Cloning, Logging, and related fixes " 2020-02-01 04:56:20 +00:00
zeskorionandGitHub 8dcc4d11cf Fix a compile issue 2020-01-28 11:17:33 -08:00
zeskorionandGitHub a5a26da21c Update heartattack.dm 2020-01-11 15:05:55 -08:00
zeskorionandGitHub 258db24b00 Add files via upload 2020-01-09 22:27:47 -08:00
zeskorionandGitHub 67bcbcdfb1 Update symptoms.dm 2020-01-09 22:08:29 -08:00
zeskorionandGitHub 7116e92b6c Update heal.dm 2020-01-09 22:07:19 -08:00
zeskorionandGitHub b657074c96 Update choking.dm 2020-01-09 22:06:54 -08:00
zeskorionandGitHub aed8b9b4bf Update presets.dm 2020-01-09 22:06:13 -08:00
zeskorionandGitHub 36ceb0b7f9 Update braindamage.dm 2020-01-09 21:59:57 -08:00
zeskorionandGitHub e4cd4072cb Update braindamage.dm 2020-01-09 21:47:02 -08:00
zeskorionandGitHub 197a4d870f Add files via upload 2020-01-09 21:25:08 -08:00
zeskorionandGitHub 52afe3d2a8 Add files via upload 2020-01-09 21:05:38 -08:00
zeskorionandGitHub 2104ba551b Update symptoms.dm 2020-01-09 21:02:34 -08:00
quotefoxandGitHub a7fde7f494 Merge pull request #101 from Kraseo/grug-smash-rock
Crusher QOL changes
2020-01-03 23:04:56 +00:00
quotefoxandGitHub 24b605b05d Merge pull request #113 from SynnGraffkin/Empty-Clones-2-Electric-Boogaloo
[Ready] Adds "Empty" Cloning, Logging, and related fixes
2019-12-12 01:07:49 +00:00
Azarak 1643406a3e Adds footwarps, available in loadout and in a new cargo crate
up
2019-12-05 09:46:22 +01:00
Toast 1aecaa24fd Crafting mind runes 2019-12-03 19:41:51 -05:00
Toast 94b33ed771 Revert "Revert "This is painful""
This reverts commit 95e35dc714.
2019-12-03 19:32:04 -05:00
quotefox 95e35dc714 Revert "This is painful"
This reverts commit 0da5609e9a.
2019-12-03 03:55:20 +00:00
quotefox b533ea8b9c Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2019-12-03 03:50:03 +00:00
quotefox 816ce5b8fe Fixes to cloning. Revert. 2019-12-03 03:48:56 +00:00
Toast 0da5609e9a This is painful 2019-11-29 01:14:04 -05:00
Kraseo c71a0c60f3 grug mine rock. rock good for tribe shaman. tribe shaman make thing blessed by gods. grug mine more rock. 2019-11-26 15:19:49 +01:00
Kraseo c42aa75fe4 no more radstorms in my autismfort-in-a-can 2019-11-24 19:37:32 +01:00
quotefox 766c8fa338 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2019-11-16 02:02:51 +00:00
quotefoxandGitHub da4973fa85 Merge pull request #72 from Suicidalpickles/plasmemes
[PORT] Departmental Plasmamen + Visors
2019-11-16 01:58:47 +00:00
quotefox 56a995a608 Bag of holding nerf. 2019-11-16 01:52:12 +00:00
quotefoxandGitHub 27a303cc6c Merge pull request #63 from SynnGraffkin/BYOS
[Port] Build Your Own Shuttle
2019-11-15 21:10:15 +00:00
Azarak d0b00ce298 Ports taser changes 2019-11-15 18:43:07 +01:00
Suicidalpickles 3ba1b7b83f plasmeme update 2019-11-12 17:03:19 -08:00
Toast ea34467f95 BYOS 2019-11-09 19:05:11 -05:00
quotefoxandGitHub 19810f7e98 Merge pull request #59 from Azarak/master
It's me trying to fix a conflict and I've never done this don't mind me
2019-11-08 20:48:47 +00:00
Azarak 80db742296 Merge branch 'master' into pr/1 2019-11-08 21:11:46 +01:00