272 Commits

Author	SHA1	Message	Date
Muhreen	6e2ec4b01e	Updates descriptions and balances suits	2020-02-27 05:17:01 -03:00
Dahlular	01943a427e	Revert "Balances the NT Private Security Officers"	2020-02-18 21:17:16 -07:00
Dahlular	c752529677	Merge pull request #203 from AtlasRules/master ... Balances the NT Private Security Officers	2020-02-18 14:52:56 -07:00
Dahlular	61eab0fa60	Merge pull request #204 from zeskorion/fuck ... deletes an underscore	2020-02-18 14:51:37 -07: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
zeskorion	7b0c0b6244	Update others.dm	2020-02-12 10:04:25 -08:00
Harry	fc4a80184e	makes NT officers not do 65 stamina, removes a taser-related line	2020-02-09 15:14:08 +00:00
Dahlular	70e6444d47	Merge pull request #193 from Azarak/hardhats2 ... Adds welding hardhats, no conflicts this time	2020-02-07 23:33:00 -07:00
Dahlular	fb77f87cbb	Merge pull request #194 from Azarak/holofan2 ... ATMOS holofans and forcefield generator icon update, temperature block for holofans and force gens going into toolbelts	2020-02-07 23:32:47 -07:00
Dahlular	0b5369275e	Merge pull request #199 from zeskorion/patch-1 ... fixes virus chems... because the last pr didnt actually get merged or something?	2020-02-07 23:32:35 -07:00
zeskorion	e81178a0dd	aa	2020-02-07 20:51:36 -08:00
zeskorion	04a1f58d3b	FUUUUUCK ... I made a pr to change this, but apparently the pr didnt change anything?? I don't know what the fuck is up with that	2020-02-06 20:38:59 -08:00
quotefox	346281b22f	Merge pull request #192 from Azarak/drinkstuff ... Lots of new drinks and fixes to them	2020-02-05 11:56:15 +00:00
Azarak	7935c9d095	Update soapstone.dm	2020-02-03 23:36:55 +01:00
Azarak	d5593ef017	Holofans, forcefield gens, temperature block	2020-02-03 21:58:35 +01:00
Azarak	088af5e060	Update hardhat.dm	2020-02-03 21:46:31 +01:00
Azarak	4c06f50180	Welding hardhats	2020-02-03 21:35:06 +01:00
Azarak	dea2f73497	Drink updates	2020-02-03 20:23:39 +01:00
Dahlular	f8a887a122	Merge pull request #191 from Azarak/fakewalls ... Fixes false walls	2020-02-03 10:34:42 -07:00
Dahlular	10cb4f3f0b	Merge pull request #181 from zeskorion/master ... Smal plasmaman tweak	2020-02-03 10:32:16 -07:00
Dahlular	378729a86d	Merge pull request #188 from zeskorion/oops ... [beepsky rants] i hate chemids	2020-02-03 10:31:10 -07:00
Dahlular	b649bec55d	Merge pull request #182 from MalricB/darntootin ... It's 12 o'clock	2020-02-03 10:29:06 -07:00
CygnusB	6cdbdca11f	Fixes Dueling.dm examine error ... and also fixes my retardation	2020-02-03 09:50:25 -03:00
Azarak	a741915398	Fixes false walls	2020-02-03 04:11:50 +01:00
zeskorion	7403b6b908	Update other_reagents.dm	2020-02-02 12:04:31 -08:00
zeskorion	5af329e404	Update plasmamen.dm	2020-02-02 12:01:23 -08:00
zeskorion	cade7e0330	FUCK citchem	2020-02-02 11:59:46 -08:00
Dahlular	5305e1a4ba	Merge pull request #177 from Azarak/neurotoxin ... Re-adds neurotoxin and adds neurosmash	2020-02-01 07:22:22 -07:00
CygnusB	34f71c489b	It's 12 o'clock ... Darn tootin' pardner	2020-01-31 19:03:44 -03:00
zeskorion	aa57777244	Update plasmamen.dm	2020-01-30 19:51:23 -08: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	b50237fd02	Re-adds neurotoxin and adds neurosmash	2020-01-29 23:41:17 +01:00
Azarak	ace77813c5	Seperates fluff from wings and add decorative wings	2020-01-29 19:01:51 +01:00
Azarak	9931130e26	update	2020-01-29 13:17:23 +01:00
Azarak	e63c7b37f3	RCD update	2020-01-29 12:45:53 +01:00
Dahlular	7cdc6cab6b	Merge pull request #172 from zeskorion/master ... [FIX] AAAAAAAAAAAAAA fucking chemcode	2020-01-29 02:52:47 -07:00
zeskorion	e5daa44ee0	Update glass.dm	2020-01-28 18:51:20 -08:00
zeskorion	53599f827a	Update others.dm	2020-01-28 18:50:40 -08:00
zeskorion	80a4cbed37	FUCK	2020-01-28 18:48:30 -08:00
zeskorion	5d6474e080	fuck	2020-01-28 18:46:53 -08:00
zeskorion	5a4d5389ee	motherfucking citchems	2020-01-28 18:45:34 -08:00
Dahlular	cf02e7fe14	Merge pull request #153 from zeskorion/master ... [PORT]here you go, bee viro	2020-01-28 12:41:59 -07:00
Dahlular	23cd1bc795	Merge pull request #168 from Azarak/spraylights ... Updates spraycans and crayons to be up to date with Citadel (colored lights and more designs to draw)	2020-01-28 11:53:48 -07:00
Dahlular	b79510f689	Merge branch 'master' into patch-3	2020-01-28 11:21:48 -07:00
Dahlular	51d638bd0d	Merge pull request #167 from DeusHarbinger/patch-4 ... watcher wing	2020-01-28 11:19:28 -07:00
Dahlular	b794a6f1ad	Merge pull request #166 from Seris02/wintercoattide2 ... more winter coats yep	2020-01-28 11:18:43 -07:00