Commit Graph

23203 Commits

Author SHA1 Message Date
KasparoVy
6f1b3bce2f Aligns the reagent bottles as they used to be, corrects an issue with filler image and the base bottle icon_state. 2016-09-02 02:10:52 -04:00
KasparoVy
0b77f70ef0 Fixes a couple bugs, resolves some issues, re-adds a few more bottle choices. 2016-08-27 23:42:31 -04:00
KasparoVy
4481caa39b Switching to underlays. 2016-08-27 21:38:26 -04:00
IcyV
be223511b9 A few more tweaks and updates.
Most of this can be attributed to KasparoVv
2016-08-27 07:46:39 -07:00
KasparoVy
6efd9efdfe bottle filler icon handling and nanoui fixes 2016-08-27 04:02:11 -04:00
IcyV
a2af7ac8ab Makes bottles not as terrible
Previously, the brown rbottles found in chemical lockers were stuck as
brown forever. Now they actually display the chemical inside of them.

The bottles for items such as morphine or toxins that you could get from
vendors always had a specific bottle that never updated based on
chemical or volume. These have new bottles and properly work now.

![bottle images](http://puu.sh/qOWuN/d1a23bf6ed.png)

Much thanks to FullOfSkittles for the bottle sprite and KasproVv for
pretty much most of getting this worked out.

🆑 IcyV
add: Adds new bottle sprite
fix: Fixes many bottles being locked to a single icon
/🆑
2016-08-26 03:51:55 -07:00
Fox McCloud
0e657cff37 Merge pull request #5534 from Crazylemon64/timeofdeath_consistency
timeofdeath is now set and used consistently
2016-08-24 20:58:30 -04:00
Crazylemon64
4e4215391a D: 2016-08-24 10:25:56 -07:00
Fox McCloud
dbc126b9c9 Merge pull request #5535 from Crazylemon64/i_hope_you_like_giant_prs
Fixes various bugs
2016-08-24 00:06:38 -04:00
Crazylemon64
ed850342e7 timeofdeath is now set and used consistently 2016-08-23 16:22:00 -07:00
Crazylemon64
03b7d1b3a9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_transition_runtime_fix 2016-08-23 13:41:39 -07:00
TheDZD
1b4565d1c3 Merge pull request #5526 from Crazylemon64/ai_movement_refactor
Moves AI movement to their own procs, and cleans up their creation
2016-08-23 14:19:13 -04:00
TheDZD
149fb8500c Merge pull request #5523 from Crazylemon64/gravygen_level_runtime
Fixes a gravity generator runtime for null-z areas
2016-08-23 14:09:19 -04:00
TheDZD
cdbdd16711 Merge pull request #5528 from Crazylemon64/canpass_runtime_fix
Fixes some runtimes when throwing hydroponics fruit
2016-08-23 14:08:26 -04:00
TheDZD
01e3aef4a3 Merge pull request #5524 from Crazylemon64/recycler_contents_fix
Fixes a runtime when a recycler eats something containing other stuff
2016-08-23 14:07:57 -04:00
TheDZD
2adcd66229 Merge pull request #5527 from Crazylemon64/human_deletion_refactor
Humans no longer spew debug messages when deleted
2016-08-23 14:07:34 -04:00
TheDZD
6a1a1067c8 Merge pull request #5525 from Crazylemon64/closet_movemob_fix
Fixes a closet runtime
2016-08-23 14:06:37 -04:00
TheDZD
15e9f5bbf4 Merge pull request #5517 from Krausus/SomeoneDidNotThinkThisThrough
Fixes Goonchat Delaying Client Creation, Again
2016-08-23 14:05:59 -04:00
TheDZD
d79ceac706 Merge pull request #5519 from Crazylemon64/pai_message_fix
Fixes a couple pAI runtimes
2016-08-23 14:05:33 -04:00
TheDZD
82427278cd Merge pull request #5518 from Crazylemon64/simple_animal_blood_fix
Fixes a runtime for non-human mobs bleeding on the floor
2016-08-23 14:05:15 -04:00
TheDZD
961d93d91c Merge pull request #5509 from Fox-McCloud/mining-shelter
Ports Mining Shelters
2016-08-23 14:03:54 -04:00
Crazylemon64
63eb62d4e4 Fixes the golem runtime in a manner less likely to bite us in the butt
later
2016-08-23 01:58:27 -07:00
Crazylemon64
118c7a0a3e Fixes a runtime when creating a golem 2016-08-23 01:34:28 -07:00
Crazylemon64
b71db4c222 Fixes a runtime when creating a new disposal after roundstart 2016-08-23 01:33:06 -07:00
Crazylemon64
06681a9c4c Slightly tweaks the level trait checker 2016-08-23 00:58:43 -07:00
Crazylemon64
84b44ea41c Random seeds now have a base_name 2016-08-23 00:56:58 -07:00
Crazylemon64
692a971e75 Fixes an examine runtime on gas tanks 2016-08-23 00:23:26 -07:00
Crazylemon64
ff23f932a2 Fixes some runtimes when throwing hydroponics fruit 2016-08-23 00:15:30 -07:00
Crazylemon64
5b20506b02 Replaces qdeleted with a cleaner macro 2016-08-22 23:49:33 -07:00
Crazylemon64
38adc54c77 Humans no longer spew debug messages when deleted 2016-08-22 23:40:57 -07:00
Crazylemon64
88a3ba1406 Moves AI movement to their own procs, and cleans up their creation 2016-08-22 23:17:48 -07:00
Crazylemon64
05ebb18b3d Fixes a closet runtime 2016-08-22 22:14:31 -07:00
Crazylemon64
eec89c6a7e Fixes a runtime when the recycler eats something and
destroys something else it was going to munch
2016-08-22 21:56:39 -07:00
Crazylemon64
b6df2db844 Fixes a gravity generator runtime for null areas 2016-08-22 21:53:10 -07:00
Crazylemon64
7c98824dbd Fixes a couple pAI runtimes 2016-08-22 21:07:17 -07:00
Crazylemon64
83e3f3a1af Fixes a runtime for non-human mobs bleeding on the floor 2016-08-22 20:55:36 -07:00
Crazylemon64
bf2a895658 Makes space transition checks more consistent
Fixes a runtime on map start due to not having updated all the border
definitions all at once - the new defines will now resolve this.
2016-08-22 19:46:23 -07:00
Krausus
6ab552f0fa Fixes Goonchat delaying client/New, again 2016-08-22 22:40:56 -04:00
TheDZD
c63369eac0 Merge pull request #5508 from Fox-McCloud/mining-drone
Mining Drone Update
2016-08-22 19:34:18 -04:00
TheDZD
22d380a6b0 Merge pull request #5510 from Fox-McCloud/mining-area-fix
Mining Area Tweak
2016-08-22 19:34:00 -04:00
TheDZD
4b372a42df Merge pull request #5511 from Krausus/BasicallyNerfingGirders
Makes Girders Not Be Bulletproof
2016-08-22 19:33:33 -04:00
TheDZD
96f07927e9 Merge pull request #5512 from Crazylemon64/dont_worry_bones_grow_back
You can now cancel surgery after cutting someone's ribcage open again
2016-08-22 19:33:11 -04:00
TheDZD
c02e5019a4 Merge pull request #5515 from Crazylemon64/surgery_fixes_v2
Abductor surgery, Face repair, now all work again
2016-08-22 19:32:56 -04:00
Crazylemon64
4326b9383e Abductor surgery, Face repair, now all work again 2016-08-22 11:42:01 -07:00
Kyep
e0d9ff0485 Fixes issue with dead SSD players 2016-08-22 01:24:57 -07:00
Fox-McCloud
f4db89eb88 full desconstruction 2016-08-21 19:56:49 -04:00
Fox-McCloud
137af9a5a9 fixups 2016-08-21 18:17:54 -04:00
Crazylemon64
80055208ec Forgot about this one, too 2016-08-21 13:26:31 -07:00
Crazylemon64
04dfa164b4 Don't worry, bones grow back (You can now mend incisions after
having cut someone's ribcage open, at Fox's request)
2016-08-21 13:13:56 -07:00
Fox-McCloud
8cd6e58c07 updates 2016-08-21 11:44:54 -04:00