Commit Graph

71 Commits

Author SHA1 Message Date
CygnusB
137ed7f372 Rings
hell yeah rings
2020-07-03 19:59:19 -03: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
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
Oposshim
1c6b863fc5 soap
i forgot to fix the soap sprite and its kinaris descript
2020-06-12 01:07:22 -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
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
78786b28da ff 2020-03-22 19:17:51 +01:00
Improvedname
f376b64f31 AAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-03-20 22:50:57 +01:00
QuoteFox
cb561ff456 fix for plushie reward 2020-03-03 13:16:25 +00:00
jbox1
13863b3cd6 Update plushes.dm 2020-02-28 17:14:36 +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
Azarak
d5593ef017 Holofans, forcefield gens, temperature block 2020-02-03 21:58:35 +01:00
Toast
6bb8fb8421 Ports Missing TG Chaplain Weapons 2020-02-02 01:48:10 -05: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
e63c7b37f3 RCD update 2020-01-29 12:45:53 +01:00
Azarak
a6dfd6b6b6 update 2020-01-28 16:58:09 +01:00
Azarak
8c4ad4c728 spray paint update 2020-01-28 04:19:54 +01:00
quotefox
40c3008637 Revert "Revert "Merge pull request #123 from SynnGraffkin/Advanced-Cams""
This reverts commit 6ac8540d7e.
2019-12-18 18:53:50 +00:00
quotefox
6ac8540d7e Revert "Merge pull request #123 from SynnGraffkin/Advanced-Cams"
This reverts commit 9f1d03b6f7, reversing
changes made to d1e1862412.
2019-12-18 18:39:34 +00:00
Toast
891489ff6d Plastic Cutlery 2019-12-14 01:54:53 -05:00
quotefox
964e5e0c78 Merge pull request #129 from Azarak/botanystuff
Adds in lots of botany stuff - 3d orange, fairygrass, new bioluminescence, bamboo, cherry bulbs, COCONUTs+
2019-12-12 01:42:55 +00:00
Azarak
05f4a3163f adds in coconuts, coconut milk, coconut bongs 2019-12-10 07:21:41 +01:00
Toast
4c91af8205 Advanced Cams 2019-12-08 03:42:05 -05:00
Azarak
db540ac496 Botany stuffs 2019-12-06 17:54:19 +01:00
Azarak
12f230d77f Ports 3 new botany plants and more bioluminescence types 2019-12-05 15:45:47 +01:00
Azarak
dd4e7df65e New cargo crates, typo fixes, and some minor fixes 2019-11-29 19:26:38 +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
002b595775 removed band 2019-11-19 04:38:44 +00:00
quotefox
933c8cf852 Merge pull request #87 from namjay1170/master
Durathread QOL
2019-11-19 03:53:45 +00:00
Nam
e8f20dae0a Durathread fix
This ones for reals

Found out some fixes I did azy already did cause I didnt update my shit :(

Couldnt make bandoliers work in crafting menu so they got moved to stack crafting and added alt jumpsuit and jumpskirt for durathread
2019-11-18 05:19:53 -08:00
Code-Cygnet
d9fe2e0e7e Updates plushes.dm
Adds new Marilyn plush. Updates plushes.dm from Cit mother branch as well.
2019-11-16 23:13:21 -05:00
Toast
54250038a7 GASES 2019-11-10 02:06:20 -05:00
quotefox
739240592e - Fix to github 2019-11-08 21:50:59 +00:00
quotefox
23d7ac11af Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13
# Conflicts:
#	icons/obj/device.dmi
2019-11-08 20:55:57 +00:00
quotefox
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
quotefox
ace551ba39 bone stuff 2019-11-08 20:48:18 +00:00
Azarak
80db742296 Merge branch 'master' into pr/1 2019-11-08 21:11:46 +01:00
quotefox
1699ed1d94 Merge pull request #54 from SynnGraffkin/Construction-Bags
[PORT] Adds construction bags for engineers
2019-11-08 19:34:39 +00:00
quotefox
db364363eb Merge pull request #57 from shellspeed1/bluespace-hotel
Ports Hilberts hotel (bluespace hotel)
2019-11-08 19:32:42 +00:00
Kabra_men
a3c09948fa Cross 2019-11-07 18:06:34 -02:00
shellspeed1
0ab8a91ea9 Adds bluespace hotel 2019-11-06 18:15:11 -08:00
Azarak
1544eafb4f TG GENETICS AAAAAAAA
aaaaaaaa
2019-11-04 23:20:16 +01:00
Toast
caa2d91eb4 Fixes 2019-11-04 03:09:52 -05:00
Toast
790881594d Bag-added 2019-11-04 02:34:49 -05:00