17769 Commits

Author	SHA1	Message	Date
Aurorablade	ddb8093335	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Arntyougoingtosayhello	2018-08-07 01:33:55 -04:00
Aurorablade	0144acd37c	lemons feedback...and conflict prep..	2018-08-07 01:30:27 -04:00
Crazy Lemon	08044a6b58	Merge pull request #9266 from Kyep/simple_animal_intent ... Allows simple_animals to change intent	2018-08-06 21:27:46 -07:00
Fox McCloud	fd5589ec37	Merge pull request #8788 from MarsM0nd/Tail_lash_fix ... Tail whip logic fix and logging	2018-08-06 23:21:59 -04:00
Fox McCloud	255b982f17	Merge pull request #9288 from Tails2091/PrizeMachien ... Reformat of Prize Machine & Merch Store List	2018-08-06 19:32:02 -04:00
Tails2091	0d07d87421	Borders Have Been Reestablished	2018-08-05 22:45:55 -04:00
Crazy Lemon	efb582412d	Merge pull request #9298 from Aurorablade/Headsets ... Slight TG Headset Communication port	2018-08-05 11:30:50 -07:00
Aurorablade	b81f61ae58	Fixes	2018-08-04 23:27:20 -04:00
Fox McCloud	4b0cbda042	Merge pull request #9316 from Crazylemon64/spaceruins_fix ... Space ruins no longer can fill the border of the level	2018-08-04 20:44:48 -04:00
Crazy Lemon	3384e50542	Merge pull request #9307 from Fox-McCloud/medical-hypo ... Medical Hypospray	2018-08-04 17:31:06 -07:00
Crazylemon64	af64e7a8ed	Space ruins no longer can fill the border of the level	2018-08-04 14:39:47 -07:00
Mars	4e86cc9f95	Merge conflict fix and proper text	2018-08-04 15:53:38 +02:00
Crazy Lemon	bfb00912af	Merge pull request #9113 from shazbot194/Shotguns_mk2 ... Shortening Sawn off Shotguns	2018-08-03 13:43:24 -07:00
Fox McCloud	3193d599cb	Medical Hypospray	2018-08-02 23:39:15 -04:00
Crazy Lemon	1452f82eaf	Merge pull request #9265 from Fox-McCloud/species-refactor-follow-up ... Species Refactor Followup	2018-08-02 17:08:57 -07:00
Tails2091	7e68c671fc	Fixed Merch Store Typos ... Also listed in order by price.	2018-08-02 18:04:58 -04:00
Fox McCloud	7f2030415f	staff of change fix	2018-08-02 13:43:44 -04:00
Fox McCloud	cafdfcd521	Merge pull request #9299 from variableundefined/LessRuntime ... Fixes customizable food runtime	2018-08-02 12:41:43 -04:00
variableundefined	eaa697173e	Fixes customizable runtime	2018-08-02 14:35:37 +08:00
Aurorablade	e8bb3451db	Stop making Late night PRs fethas	2018-08-02 02:22:02 -04:00
Crazy Lemon	513a55e097	Merge pull request #9293 from variableundefined/Moreruntime ... Fixes some more runtime	2018-08-01 18:07:03 -07:00
Tails2091	b9312aa323	Changed buying to button instead of link text ... Makes it easier to click.	2018-08-01 19:01:21 -04:00
variableundefined	9c2e725e4b	Fixes some more runtime	2018-08-01 17:44:09 +08:00
Crazy Lemon	f0ce356dd9	Merge pull request #9289 from variableundefined/HoodRuntime ... Fix hood runtime	2018-07-31 23:06:34 -07:00
variableundefined	082703e2ff	Fix hood runtime	2018-08-01 13:05:34 +08:00
Tails2091	d9a122a02b	Removed Borders ... Glory to the New Arstotzka!	2018-07-31 20:06:19 -04:00
Crazy Lemon	25d4081a9a	Merge pull request #9272 from Tails2091/KarmaRefundo ... Changes Karma Refund To Switches	2018-07-31 17:03:47 -07:00
Crazy Lemon	64058328d9	Merge pull request #9281 from CornMyCob/desc-fixes ... Small grammar fixes	2018-07-31 17:01:24 -07:00
Tails2091	0ce098264f	Ordered Prize List By Price ... Reordered prize list by price least to greatest. also made minor text edits.	2018-07-31 19:38:19 -04:00
Tails2091	86b48debb5	Reformats Prize Machine Text ... Makes prize list readable. Window size now matches other machines, disabled resize.	2018-07-31 19:37:01 -04:00
Fox McCloud	b5c18f43ca	Merge pull request #9282 from Crazylemon64/blowing_out_dust ... Cleans up useless syntax and macro redefinitions	2018-07-31 18:43:07 -04:00
Crazy Lemon	ef2e3f2b00	Merge pull request #9285 from variableundefined/RuntimeBluespaceProjector ... Fix runtime with bluespace projector	2018-07-31 11:12:26 -07:00
variableundefined	a0dacfb6be	Fix runtime	2018-07-31 20:42:06 +08:00
Crazy Lemon	27cf07c77b	Merge pull request #9273 from Tails2091/TixFix ... Fixes Prize Ball Dropping Single Ticket	2018-07-30 23:28:07 -07:00
Crazylemon64	7b4dd7eb19	Cleans out various macro redefinitions or useless use of syntax	2018-07-30 23:24:35 -07:00
CornMyCob	b08ebd0cbe	Small grammar fixes	2018-07-30 22:45:56 +01:00
Tails2091	012b1dded0	Changed to ispath and removed unecessary variable	2018-07-29 22:07:47 -04:00
datlo	f167c32424	Fixes pyrosium description	2018-07-29 18:42:30 +01:00
Mars	98d26ff70a	Merge conflict resolution	2018-07-29 14:38:11 +02:00
Tails2091	a81a3d0661	Fixes Prize Ball dropping single tickets	2018-07-28 17:30:52 -04:00
Tails2091	15beced777	Changes karma refund to use switches	2018-07-28 17:28:58 -04:00
KasparoVy	c8f04a86f4	Fixes Head Robotization by Resetting alt_head and icon_name ... Fixes issues robotizing the heads of mobs with alt_heads by resetting the alt_head and icon_name for sanity.	2018-07-28 00:01:09 -04:00
Kyep	da04b48df5	do it via screen/act_intent instead	2018-07-27 17:15:25 -07:00
Kyep	740a35d248	handles default HARM mobs	2018-07-27 15:55:29 -07:00
Kyep	ee0e744a3c	Simple animal intent switch	2018-07-27 15:48:20 -07:00
Fox McCloud	2e10eb96d0	Species Refactor Followup	2018-07-27 18:35:01 -04:00
Fox McCloud	76b81b668e	Merge pull request #9258 from variableundefined/RoboticAnalyzer ... Cyborg analyzer no longer rounds off damage number	2018-07-27 15:26:45 -04:00
Crazy Lemon	1d6c9225e7	Merge pull request #9247 from Fox-McCloud/abductor-update ... Abductor update	2018-07-27 12:22:15 -07:00
Fox McCloud	4f10f52c7e	tweaks	2018-07-27 14:51:04 -04:00
Fox McCloud	b687b5fa42	Merge pull request #9249 from Crazylemon64/buildmode_fixes ... A couple buildmode fixes	2018-07-27 01:27:37 -04:00