27045 Commits

Author	SHA1	Message	Date
uraniummeltdown	a5e99cd764	plants no longer take 2x as many cycles to age	2017-11-26 21:07:00 +04:00
tigercat2000	1d45fd82a7	Merge pull request #8393 from Fox-McCloud/item-pick-up-fix ... Fixes Picking Up Items	2017-11-22 19:54:57 -08:00
Fox-McCloud	da1dcab8ea	Fixes Picking Up Items	2017-11-22 19:38:52 -05:00
Kyep	835c9c9066	Typo fix	2017-11-20 21:48:00 -08:00
tigercat2000	2cd66783ec	Merge pull request #8384 from Fox-McCloud/shuttle-curse-fix ... Fixes Shuttle Curse Exploits	2017-11-19 06:57:51 -08:00
tigercat2000	88efd6192b	Merge pull request #8385 from Aurorablade/YouDontGlow ... No Bone Rune Glow	2017-11-19 06:55:31 -08:00
tigercat2000	89f300918c	Merge pull request #8381 from MarsM0nd/ERT_species ... No invisible ERT suits	2017-11-18 05:35:04 -08:00
tigercat2000	e25416dd3e	Merge pull request #8380 from MarsM0nd/False_Flag ... Removes a wrong usage of two flags	2017-11-18 05:34:16 -08:00
Aurorablade	070a9556bd	Simplified	2017-11-18 00:17:16 -05:00
Fox-McCloud	5c964afb2d	wording tweak	2017-11-18 00:07:52 -05:00
Fox-McCloud	ea222b2c95	Fixes Shuttle Curse Exploits	2017-11-18 00:05:42 -05:00
Aurorablade	c0d19b9398	noglow	2017-11-18 00:03:42 -05:00
Aurorablade	26511031d1	0ver carbonated	2017-11-17 23:05:12 -05:00
Aurorablade	b59eb2de50	godammit	2017-11-17 22:30:57 -05:00
Mars	e18bdc8766	Adds correct sprite sheets to ERT suits ... Currently, only drask do have ERT hardsuit sprites, so it will only use their sprites, else use the default sprite, instead of failing to find sprites, and give invisible hardsuits.	2017-11-17 20:12:16 +01:00
Mars	430d9e0d3e	Flags were already defined ... Parent type does already supply the cover flags being set, no reason to set them again.	2017-11-17 19:21:20 +01:00
Mars	f2637d21a5	Cover goes to cover flags	2017-11-17 19:13:05 +01:00
tigercat2000	19adf0bfa5	Merge pull request #8279 from msgerbs/master ... Fixes weirdness when a mob being force-fed finishes a snack	2017-11-13 07:55:20 -08:00
tigercat2000	df0b404252	Merge pull request #8365 from Allfd/ambulance ... Atmos Fix	2017-11-13 07:54:05 -08:00
tigercat2000	0dcfd4de5a	Merge pull request #8342 from Fox-McCloud/food-recipe-fix ... Fixes Enchilada Food Recipe	2017-11-13 07:53:33 -08:00
Alffd	c293259397	Fix issue with not ending draining	2017-11-12 20:54:27 -05:00
Alffd	c084f43aca	Reversed owner	2017-11-12 20:42:04 -05:00
Fox McCloud	399219b31d	Merge pull request #8368 from tigercat2000/512 ... 512 Compilation & Travis	2017-11-12 18:37:52 -05:00
tigercat2000	2a9c7cffa8	Merge pull request #8332 from Kyep/execute_round_two ... Helps prevent blatently illegal executions	2017-11-11 21:16:11 -08:00
Kyep	269f2426ff	Tiger requests	2017-11-11 16:07:10 -08:00
Kyep	c0f0eb7921	Tully requests	2017-11-11 16:00:14 -08:00
tigercat2000	b4fa39d940	512 Compilation & Travis	2017-11-11 09:50:21 -08:00
tigercat2000	367f0f1ca2	Merge pull request #8155 from FalseIncarnate/windows ... Windows Update	2017-11-10 22:00:19 -08:00
Alffd	a2e9258b7b	Atmos Fix	2017-11-11 00:10:21 -05:00
Crazy Lemon	86676221b5	Merge pull request #8242 from Allfd/vamp ... Makes vampires more containable	2017-11-10 12:29:43 -08:00
Alffd	a1c085ac0c	Makes blood loss more reasonable	2017-11-10 14:03:02 -05:00
tigercat2000	612d81a906	Merge pull request #8291 from Anasari/AssumingGender ... Stop assuming gender.	2017-11-10 10:15:17 -08:00
tigercat2000	5450fe3e73	Merge pull request #8338 from Anasari/NorthernHair ... Add in 79 polaris hairstyles	2017-11-10 09:59:53 -08:00
Kyep	6e7e5aa355	Removes centcom colorizing	2017-11-08 02:18:51 -08:00
FalseIncarnate	49c65da656	Shuttle window health reduction	2017-11-07 21:20:09 -05:00
Aurorablade	36e0e8832a	F	2017-11-05 21:43:50 -05:00
Fox McCloud	18cbce0ec6	Merge pull request #8350 from KasparoVy/fix_hair_dye ... Fixes Barber's Dye Bottle	2017-11-05 17:33:45 -05:00
KasparoVy	727cf1998a	Fixes Barber's Dye Bottle ... My own bad, I changed the way mob colours are handled without updating dye bottles. Ironically, it seems I'd already sorted out the OTHER kind of hair dye (the reagent).	2017-11-05 17:20:56 -05:00
Aurorablade	3a63b17657	guardian runtime	2017-11-05 01:10:34 -05:00
Crazy Lemon	7ceffd1098	Merge pull request #8343 from Fox-McCloud/remote-talk-metagaming ... Fixes Remote Talk Metagaming	2017-11-04 18:51:55 -07:00
FalseIncarnate	6a941a8526	Message and spacing tweaks	2017-11-04 18:13:39 -04:00
FalseIncarnate	66f10657bd	fix merge conflicts (again)	2017-11-04 17:37:30 -04:00
Fox-McCloud	f6d64455ff	Fixes Remote Talk Metagaming	2017-11-04 16:05:57 -04:00
Fox-McCloud	58724b4b73	Fixes Enchillada Food Recipe	2017-11-04 15:46:35 -04:00
Ansari	d77748fd70	Fix Doublebun & Bun4 not working. ... TRAVIS SAMA DELIVER ME	2017-11-02 21:35:25 +08:00
Ansari	eb65912c14	Add in 3 missing hairstyle to the code. Remove redundant Joestar & Doublebuns from dmi file.	2017-11-02 20:09:08 +08:00
Ansari	4e9196f5ae	Port in 77 hairstyles from Polaris	2017-11-02 17:35:58 +08:00
Ansari	266a96a23c	remove redundant you	2017-11-02 11:23:55 +08:00
Ansari	da924006a6	guess i spaced out during this one	2017-11-02 11:20:37 +08:00
Crazy Lemon	63ad6a2efb	Merge pull request #8131 from MarsM0nd/Holofix ... Makes holograms end when they should	2017-11-01 10:14:10 -07:00