Commit Graph

65 Commits

Author SHA1 Message Date
Dahlular
488795db33 Merge pull request #245 from improvedname/nerf-
Nerfs lavaland side bombs
2020-04-20 16:30:45 -06:00
QuoteFox
b35c02d54f Penis update
*penis music*
2020-04-19 06:46:27 +01:00
Dahlular
9a8a8af918 Fixes and updates code a bit ye
cum is stored in the mouth and rhrhrnglnrhrlbrhttrrhrr
2020-04-17 10:10:18 -06:00
Dahlular
d3882fb0f4 Merge branch 'master' into sizecode 2020-04-17 08:07:37 -06:00
Improvedname
1e4c7e8796 Update maps.dm 2020-03-24 16:18:45 +01:00
Improvedname
905d1c622e Map 2020-03-23 17:27:53 +01:00
Improvedname
78786b28da ff 2020-03-22 19:17:51 +01:00
Improvedname
f376b64f31 AAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-03-20 22:50:57 +01:00
Dahlular
4d707fc18d Buggy Sizecode Interactions 1
FUCK.
2020-03-17 12:22:39 -06:00
QuoteFox
961a543992 Merge pull request #222 from jbox144/patch-10
Hugbot
2020-03-13 00:39:23 +00:00
jbox1
479f54c907 Update robots.dm 2020-03-12 17:14:28 +11:00
jbox1
f8ebf41378 Update robots.dm 2020-03-12 17:13:49 +11:00
Improvedname
0c1ddee60e SINGING 2020-03-06 20:12:43 +01:00
Dahlular
0074c18915 Merge pull request #211 from zeskorion/master
keepin beeviro porting consistent for ya
2020-03-03 00:16:29 -07:00
zeskorion
595b471607 Update traits.dm 2020-02-27 12:09:29 -08:00
zeskorion
23b937c4ec Update mobs.dm 2020-02-23 17:17:55 -08:00
jbox1
88d5e33d58 b 2020-02-19 13:03:29 +11:00
jbox1
91f1455aac Added new trait define 2020-02-15 21:35:30 +11: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
quotefox
037397eec1 Revert "[Ready] Adds "Empty" Cloning, Logging, and related fixes " 2020-02-01 04:56:20 +00:00
Dahlular
f9990f20b2 Merge pull request #178 from Azarak/looc
Ports lightmode/darkmode fixes
2020-01-30 05:25:29 -07:00
Dahlular
a142517573 Merge pull request #176 from Azarak/Cosmetic-wings
Ports decorative wings for character customization and seperates moth fluff from moth wings
2020-01-30 05:10:20 -07:00
Dahlular
b3360b7cde Merge pull request #174 from Azarak/rcd-update
Ports all the RCD changes, updates from Citadel
2020-01-30 04:47:41 -07:00
Azarak
46d6fc7199 Ports lightmode/darkmode fixes 2020-01-30 00:36:06 +01:00
Azarak
ace77813c5 Seperates fluff from wings and add decorative wings 2020-01-29 19:01:51 +01:00
Azarak
e63c7b37f3 RCD update 2020-01-29 12:45:53 +01:00
Dahlular
95fbeca50c Revert "changes dong girth to more reasonable size" 2020-01-28 13:10:11 -07:00
Dahlular
cf02e7fe14 Merge pull request #153 from zeskorion/master
[PORT]here you go, bee viro
2020-01-28 12:41:59 -07:00
Burns-The-Potatos
3d6132e630 Update citadel_defines.dm 2020-01-15 15:14:11 -07:00
zeskorion
24b62dd010 Update traits.dm 2020-01-09 21:37:02 -08:00
quotefox
5b5b8d137a Merge pull request #107 from shellspeed1/nerfs-research-point-generation-from-bz
Nerfs research point generation from bz
2019-12-18 15:27:59 +00: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
quotefox
17da27abe6 Merge pull request #108 from SynnGraffkin/Empty-Clones
[Port] Adds "Empty" Cloning, Logging, and related fixes
2019-11-30 20:15:56 +00:00
quotefox
22db566e21 Merge pull request #105 from SynnGraffkin/Fuck-Xenos
[Port] Adds MK I Ripley and conversion kit for MK II
2019-11-30 20:15:02 +00:00
quotefox
cbb3776766 Merge pull request #99 from Kraseo/513compat
Adds 513 compatibility
2019-11-30 20:14:03 +00:00
Toast
0da5609e9a This is painful 2019-11-29 01:14:04 -05:00
shellspeed1
22e3cd5bb1 Update reactions.dm 2019-11-28 00:28:58 -08:00
Toast
144d54e4be TFW you have to define bullets to get code to work 2019-11-27 20:26:22 -05:00
Kraseo
e0a9fecaaf i don't have a funny joke so have this commit log instead 2019-11-25 15:38:16 +01:00
quotefox
20d85b8d35 bones breaking system 2019-11-25 07:11:44 +00:00
Jessiekhat
184485c65c Cyborg Overhaul Booty+
Added dickgirl version of all bootyborgs and improved all of the sprites. Ported /tg/station's service, beaker, and circuit manipulator modules and upgrades for their respective borg types. Added rags, soap, crowbar, ect. to appropriate cyborg modules for quality of life improvment. Made similar changes to dog-borgs to bring them up to speed with the rest of the borg modules.
2019-11-20 23:49:51 -06:00
quotefox
47c8a174fa Fix to jukebox 2019-11-16 01:51:45 +00:00
Azarak
d0b00ce298 Ports taser changes 2019-11-15 18:43:07 +01:00
quotefox
1bc339f236 Merge pull request #75 from Suicidalpickles/bbbbbbbbbbbb
[PORT] Max temp on fusion + high rads no longer burn
2019-11-14 01:51:27 +00:00
Suicidalpickles
fca769c182 e 2019-11-12 21:17:42 -08:00
quotefox
fc4a4feca3 Merge pull request #71 from shellspeed1/more-plants
Adds a bunch of plants to botany
2019-11-12 00:40:37 +00:00