164 Commits

Author	SHA1	Message	Date
Archie	b443f02b6d	Merge remote-tracking branch 'upstream/master' into bobross	2021-07-19 22:53:33 -03:00
kevinz000	865ff4fa08	Merge pull request #9610 from Ghommie/Ghommie-cit273 ... ports anti-magic component code updates (holymelon sold separately).	2021-07-15 17:43:18 -03:00
Kabra_men	5ad4b776e5	new statue, dungeon and some necessary changes in stargate	2021-07-06 16:57:27 -03:00
Kabra_men	b0a98f0c18	sandstone walls now can connect to windows	2021-07-01 17:31:17 -03:00
Ghom	8e982a32c4	Ports TG painting code (Needs VV rework by kevinz)	2021-06-27 05:01:29 -03:00
Dahlular	9867eae532	Merge pull request #1310 from Kabramen/Stargate-SG-1 ... Stargate SG-1 (New Gateway Map + Ghost role)	2021-06-22 23:31:56 -06:00
Kabra_men	31d4db56a1	Stargate SG-1	2021-06-21 04:19:12 -03:00
quotefox	a8d775127e	jesus, I just want armrests.	2021-06-19 01:07:33 +01:00
quotefox	c0571dccb7	all this for a stupid chair?!	2021-06-19 00:53:05 +01:00
quotefox	be869a8dd2	whoops.	2021-06-19 00:49:52 +01:00
quotefox	0d54d98d67	Single Sofa Chair	2021-06-19 00:48:54 +01:00
Lin	a5cf94ab29	Merge pull request #10212 from Ghommie/Ghommie-cit471 ... Ports some hud and update_icon code updates.	2021-06-04 15:23:40 -03:00
Putnam3145	d5f50d094a	Merge pull request #10209 from Ghommie/Ghommie-cit470 ... ports "Standardize obj/updateicon() and update_icons() to update_icon()"	2021-06-04 15:06:24 -03:00
kevinz000	0d4b96fc76	Excludes certain ghost roles from being affected by health events	2021-05-30 20:20:01 -03:00
silicons	d4db51175f	Merge pull request #13965 from Xantholne/GoodNightDisky ... Good Night Disky	2021-05-23 04:36:37 -03:00
Dahlular	62bed91cc3	Merge pull request #1179 from lyricalpaws/lets-go-mining ... Mining balance changes, some new icons, and good stuff.	2021-05-23 00:32:26 -06:00
Chloe Carver-Brown	f9c33637ec	Medics love me	2021-05-20 17:55:51 +01:00
Chloe Carver-Brown	8872b20c42	Woah!	2021-05-20 10:34:18 +01:00
Dahlular	90ba8f2b64	Map fixes, gravity fixes, many fixes	2021-04-29 21:21:52 -06:00
Dahlular	2723507a0f	potential atmos fixes	2021-04-28 23:01:54 -06:00
Dahlular	6c72b0e0e6	Merge remote-tracking branch 'upstream/master' into cumcom	2021-04-18 23:17:45 -06:00
QuoteFox	fb21e779b1	Nail paint cosmetics	2021-04-17 22:41:02 +01:00
Chloe Carver-Brown	5e5b43212e	fuck shit piss	2021-04-08 01:36:09 +01:00
QuoteFox	99f861a512	new plating and shelves	2021-03-28 16:48:02 +01:00
QuoteFox	a4826e6eab	Revert "Merge remote-tracking branch 'upstream/master'" ... This reverts commit f5cf7f6f5a, reversing changes made to a32444dae7.	2021-03-27 10:56:34 +00:00
QuoteFox	a1644811ac	Ported Map; Lambda Station	2021-03-25 12:06:32 +00:00
Dahlular	400354cc6e	Merge remote-tracking branch 'upstream/master' into cumcom	2021-03-25 00:15:19 -06:00
QuoteFox	fa3e559b78	Merge pull request #1046 from lyricalpaws/master ... Adds psychologist role, changes Box med a bit	2021-03-23 18:13:40 +00:00
Chloe Carver-Brown	0620b5c682	psych job!	2021-03-23 17:21:44 +00:00
QuoteFox	38b5e5b0eb	locker and jumpsuit equip sounds.	2021-03-23 16:27:18 +00:00
Dahlular	a936acf6ce	crystal fixes	2021-03-10 04:45:19 -07:00
Dahlular	1003b04929	medium crystals	2021-03-10 04:30:38 -07:00
Dahlular	79f00a10b8	random small crystals	2021-03-10 03:29:40 -07:00
Dahlular	c72cde0fab	fixes	2021-03-08 12:31:19 -07:00
QuoteFox	9dd61f3efb	Pens now write on people, Harm intent to stab them like the old way. ... Washable at showers.	2021-02-22 23:08:42 +00:00
Kharkov72	4e2d9a3bd0	I cannot let this go unadded	2021-02-21 00:53:05 -05:00
DragonTrance	75415bb7af	you know what, dont even deconstruct them	2021-02-10 07:33:11 -07:00
DragonTrance	d09400af15	stop exploiting constructable showers	2021-02-10 07:23:31 -07:00
QuoteFox	4980b0556d	Merge pull request #936 from ArchieBeepBoop/solar ... Modular Solar Panels + Solar Tracker Fix + Compile issue fix	2021-01-29 20:38:48 +00:00
Archie	d50b781203	SolarTest11	2021-01-28 20:22:08 -03:00
Kabra_men	0b1a40baee	that's a lot of stuff heck	2021-01-28 18:28:48 -03:00
Kabra_men	41c87b5e85	more wood stuff	2021-01-25 17:37:06 -03:00
QuoteFox	3566f1c9a6	fixed chair padding on shuttle chairs. ... fixed chair padding on shuttle chairs.	2021-01-23 10:55:32 +00:00
Kabra_men	3e6fb7b5e8	TREES	2021-01-22 20:45:16 -03:00
Kabra_men	cd9fb045e1	GRASS	2021-01-21 12:02:42 -03:00
Kabra_men	6c0a7b1b39	WOOD	2021-01-21 03:09:52 -03:00
Archie	ec28d0f66d	Line ending conflict fix	2021-01-21 02:45:10 -03:00
nik707	858f994b5d	Adds: The Chad Plasmaglass Table	2021-01-21 02:44:06 -03:00
QuoteFox	75eb4d5696	New chairs and recipes! ... New chairs and recipes!	2021-01-21 01:20:12 +00:00
CygnusB	8ece699ed9	Merge branch 'master' into punishesarchie	2021-01-19 06:30:10 -03:00