8497 Commits

Author	SHA1	Message	Date
kevinz000	30a006e42f	additions, and it now nulls out.	2019-07-08 18:21:04 -07:00
kevinz000	270cdb1c43	CE memes	2019-07-08 12:35:21 -07:00
kevinz000	adf2166c57	t	2019-07-08 12:31:15 -07:00
kevinz000	1b4df74efb	Merge pull request #8802 from Ghommie/Ghommie-cit101 ... Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.	2019-07-07 02:39:07 -07:00
kevinz000	6e5ec4594c	Merge pull request #8800 from Sishen1542/freeza ... Adds click interactions to atmos heater/freezer	2019-07-07 02:35:12 -07:00
kevinz000	e227d5575c	Merge pull request #8825 from Ghommie/Ghommie-cit110 ... Ports "Fixes default supplypods exploding their contents" & co.	2019-07-07 02:34:47 -07:00
kevinz000	91f114f717	Merge pull request #8832 from Ghommie/Ghommie-cit116 ... Fixes new player runtime that makes people unable to join rounds.	2019-07-07 02:33:32 -07:00
kevinz000	9d13576cc9	Merge pull request #8826 from Ghommie/Ghommie-cit111 ... Ports "Adds safer helper for alt-click turf listing"	2019-07-07 02:32:56 -07:00
kevinz000	6944725cfb	Merge pull request #8824 from Ghommie/Ghommie-cit109 ... Ports "Fixes damp rag not smothering people"	2019-07-07 02:31:26 -07:00
Ghommie	fe2abc990b	Fixes new player runtime that makes people unable to join rounds.	2019-07-06 04:51:56 +02:00
kevinz000	748550895d	Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight ... Ports traitor codeword highlighting	2019-07-05 06:57:49 -07:00
kevinz000	77743c9a0f	Merge pull request #8794 from Ghommie/Ghommie-cit100 ... Fixes the uplink category indexing.	2019-07-05 06:56:22 -07:00
kevinz000	231e0170a9	Merge pull request #8663 from Ghommie/Ghommie-cit58 ... Peanuts, peanut butter, and PB&J sandwiches.	2019-07-05 06:55:49 -07:00
kevinz000	7544748570	Merge pull request #8790 from deathride58/pryablesleepers ... Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers via crowbar	2019-07-05 06:55:18 -07:00
Ghommie	3c2e03c247	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58	2019-07-04 23:46:04 +02:00
Ghommie	5ff8be0faa	Ports "Adds safer helper for alt-click turf listing"	2019-07-04 22:42:51 +02:00
Ghommie	b41e289db3	Ports "Fixes default supplypods exploding their contents" & co.	2019-07-04 22:35:13 +02:00
Ghommie	37cf41a3bb	Ports "Fixes damp rag not smothering people"	2019-07-04 22:06:16 +02:00
Sishen	e5cd1bd7c2	Update thermomachine.dm	2019-07-03 17:46:05 -04:00
Sishen	4fa244e8e4	Update thermomachine.dm	2019-07-03 17:41:27 -04:00
Sishen	9e514bfab5	Update thermomachine.dm	2019-07-03 17:39:41 -04:00
Sishen	df75f9f289	Update thermomachine.dm	2019-07-03 17:38:19 -04:00
Sishen	a9f5b99510	Update thermomachine.dm	2019-07-03 16:55:14 -04:00
kevinz000	bce4ce31ab	Merge pull request #8778 from Ghommie/Ghommie-cit97 ... Porting in 18 new drinks from the TGstation, plus tweaking and fixes.	2019-07-03 13:47:04 -07:00
kevinz000	75f1dca544	Merge pull request #8773 from Sishen1542/podgang ... Podweak now have all customization options.	2019-07-03 13:46:08 -07:00
kevinz000	10a584c71f	Merge pull request #8776 from Ghommie/Ghommie-cit96 ... Porting in donut fixes, beepsky smash and Neurotoxin reworks.	2019-07-03 13:45:02 -07:00
kevinz000	ab217e81e6	Merge pull request #8781 from Sishen1542/plasteel ... Adds plasteel to medical and security techfabs.	2019-07-03 13:42:22 -07:00
kevinz000	9654308a94	Merge pull request #8809 from Ghommie/Ghommie-cit103 ... Quickfixing latejoin ghost roles, I'm sorry.	2019-07-03 09:52:14 -07:00
kevinz000	948bba1274	Merge pull request #8799 from Trilbyspaceclone/Cargo_lewds ... Adds Promiscuous Organs crate to cargo	2019-07-03 09:51:47 -07:00
kevinz000	0f0d5323a3	Merge pull request #8797 from Sishen1542/rotate-emitters ... Emitters can be rotated instead of only flipped	2019-07-03 05:20:37 -07:00
Ghommie	1fd50cc15a	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit96	2019-07-03 04:52:57 +02:00
Ghommie	33687dc2bc	I'm an idiot, I need to pick an element within the list, not the list itself!!	2019-07-01 22:53:42 +02:00
Ghommie	d0a001f663	Quickfixing latejoin ghost roles, I'm sorry.	2019-07-01 22:47:51 +02:00
Ghommie	8c1e6ff66a	Thanks for pointing that out, lolman.	2019-07-01 09:24:35 +02:00
Ghommie	70dc9b9122	fomatting.	2019-06-30 22:37:48 +02:00
Sishen	f55ef6a755	Update thermomachine.dm	2019-06-30 16:10:54 -04:00
Ghommie	f39a5d2f6a	Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix.	2019-06-30 21:53:33 +02:00
TrilbySpaceClone	9d6c930b2c	owo ... Wat dis?	2019-06-30 15:47:45 -04:00
Sishen	2047d86095	Update emitter.dm	2019-06-30 15:33:34 -04:00
Ghommie	831c91fce2	Fixes the uplink category indexing.	2019-06-30 17:43:34 +02:00
Ghommie	c569da5713	Fixes PDA skin preference not saving up.	2019-06-30 17:17:23 +02:00
deathride58	4b83110db7	fuck copypasta; Fixes master not compiling. Stop blindly copy-pasting shit from other codebases without even so much as making sure it compiles. Holy fuck.	2019-06-30 05:02:51 -04:00
deathride58	1efd1b2634	oh, and lets add a length check real quick to make sure the sleeper actually has shit in it	2019-06-30 04:35:34 -04:00
deathride58	cb5ed2d2cd	Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers with a crowbar	2019-06-30 04:29:48 -04:00
kevinz000	09c8a45fe2	Merge pull request #8770 from Arturlang/Carp_Deflecting ... Carp now deflects the bullets instead of making them dissapear.	2019-06-29 20:08:47 -07:00
Sishen	3aaed75a95	Update smelting_designs.dm	2019-06-29 04:49:29 -04:00
Ghommie	ad3b709c40	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97	2019-06-29 06:39:21 +02:00
Ghommie	0371a5513a	Porting in 18 new drinks from the TGstation, plus tweaking and fixes.	2019-06-29 06:03:57 +02:00
kevinz000	c495a2aa47	Merge pull request #8739 from Sishen1542/makinggolemsgreatagain ... Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!	2019-06-28 20:32:15 -07:00
kevinz000	a6caf4c63f	Merge pull request #8729 from Ghommie/Ghommie-cit79 ... Ports "Removes SSreligion"	2019-06-28 20:30:44 -07:00